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 2012/04/30 23:10:22 UTC

svn commit: r1332396 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java

Author: rmannibucau
Date: Mon Apr 30 21:10:22 2012
New Revision: 1332396

URL: http://svn.apache.org/viewvc?rev=1332396&view=rev
Log:
TOMEE-171 managing injections in jsf classes

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1332396&r1=1332395&r2=1332396&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Mon Apr 30 21:10:22 2012
@@ -2001,8 +2001,11 @@ public class AnnotationDeployer implemen
             IAnnotationFinder finder = webModule.getFinder();
 
             if (finder != null) {
+                final List<String> apis = new ArrayList<String>(WEB_CLASSES.length + JSF_CLASSES.length);
+                apis.addAll(Arrays.asList(JSF_CLASSES));
+                apis.addAll(Arrays.asList(WEB_CLASSES));
 
-                for (String apiClassName : WEB_CLASSES) {
+                for (String apiClassName : apis) {
                     final Class<? extends Annotation> clazz;
                     try {
                         clazz = (Class<? extends Annotation>) classLoader.loadClass(apiClassName);
@@ -2013,6 +2016,7 @@ public class AnnotationDeployer implemen
                     final List<Class<?>> found = finder.findAnnotatedClasses(clazz);
                     classes.addAll(found);
                 }
+
             }
 
             AnnotationFinder annotationFinder = createFinder(classes.toArray(new Class<?>[classes.size()]));