svn commit: r1619574 - in /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb: config/AnnotationDeployer.java testing/ApplicationComposers.java

[rm...@apache.org]

Author: rmannibucau
Date: Thu Aug 21 20:46:32 2014
New Revision: 1619574

URL: http://svn.apache.org/r1619574
Log:
TOMEE-1325 suporting interfaces for synamic subclassing - rest link

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

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1619574&r1=1619573&r2=1619574&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Thu Aug 21 20:46:32 2014
@@ -244,6 +244,8 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
 
+import static java.util.Arrays.asList;
+
 /**
  * @version $Rev$ $Date$
  */
@@ -2293,6 +2295,7 @@ public class AnnotationDeployer implemen
                     AnnotationFinder af = (AnnotationFinder) ejbModule.getFinder();
 
                     final List<Class<?>> ancestors = Classes.ancestors(clazz);
+                    ancestors.addAll(asList(clazz.getInterfaces()));
                     if (dynamicBean) {
                         final Proxy p = metaClass.getAnnotation(Proxy.class);
                         if (p != null) {
@@ -5398,6 +5401,8 @@ public class AnnotationDeployer implemen
                         webModule.getEjbRestServices().add(name);
                     }
                 }
+            } else if (isEJB(clazz) && DynamicSubclass.isDynamic(clazz)) {
+                classes.add(clazz.getName());
             }
         }
 
@@ -5413,6 +5418,8 @@ public class AnnotationDeployer implemen
                 } else {
                     webModule.getEjbRestServices().add(clazz.getName());
                 }
+            } else if (isEJB(clazz) && DynamicSubclass.isDynamic(clazz)) {
+                classes.add(clazz.getName());
             }
         }
 

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java?rev=1619574&r1=1619573&r2=1619574&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java Thu Aug 21 20:46:32 2014
@@ -73,6 +73,7 @@ import org.apache.webbeans.spi.ContextsS
 import org.apache.webbeans.spi.LoaderService;
 import org.apache.webbeans.web.lifecycle.test.MockHttpSession;
 import org.apache.webbeans.web.lifecycle.test.MockServletContext;
+import org.apache.xbean.finder.Annotated;
 import org.apache.xbean.finder.AnnotationFinder;
 import org.apache.xbean.finder.ClassFinder;
 import org.apache.xbean.finder.IAnnotationFinder;
@@ -84,6 +85,8 @@ import org.apache.xbean.finder.archive.C
 import org.apache.xbean.finder.archive.JarArchive;
 import org.xml.sax.InputSource;
 
+import javax.ejb.Singleton;
+import javax.ejb.Stateless;
 import javax.enterprise.context.ConversationScoped;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.SessionScoped;
@@ -490,7 +493,8 @@ public final class ApplicationComposers 
                         ejbModule.setBeans(beans(new Beans(), cdiDecorators, cdiInterceptors, cdiAlternatives));
                     }
 
-                    webModule.setFinder(finderFromClasses(webModule, classes, findFiles(jarsAnnotation)));
+                    final IAnnotationFinder finder = finderFromClasses(webModule, classes, findFiles(jarsAnnotation));
+                    webModule.setFinder(finder);
                     ejbModule.setFinder(webModule.getFinder());
                 } else if (obj instanceof WebModule) { // will add the ejbmodule too
                     webModulesNb++;