tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1538513 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
Date Mon, 04 Nov 2013 06:53:20 GMT
Author: rmannibucau
Date: Mon Nov  4 06:53:20 2013
New Revision: 1538513

URL: http://svn.apache.org/r1538513
Log:
we need to enable meta by default for ejbmodules

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

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java?rev=1538513&r1=1538512&r2=1538513&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
Mon Nov  4 06:53:20 2013
@@ -96,10 +96,11 @@ public class FinderFactory {
             } else {
                 finder = newFinder(new DebugArchive(new ConfigurableClasspathArchive(module.getClassLoader(),
url)));
             }
-            if ("true".equals(module.getProperties().getProperty(FORCE_LINK, "false"))) {
+            if ("true".equals(SystemInstance.get().getProperty(FORCE_LINK, module.getProperties().getProperty(FORCE_LINK,
"false")))) {
                 finder.link();
             } else {
-                enableFinderOptions(finder);
+                finder.enableMetaAnnotations(); // needed to stay compliant
+                enableSubclassing(finder);
             }
         } else {
             finder = new AnnotationFinder(new ClassesArchive());
@@ -147,13 +148,17 @@ public class FinderFactory {
         if (annotationFinder.hasMetaAnnotations()) {
             annotationFinder.enableMetaAnnotations();
         }
+        enableSubclassing(annotationFinder);
+
+        return annotationFinder;
+    }
+
+    private static void enableSubclassing(AnnotationFinder annotationFinder) {
         if (enableFindSubclasses()) {
             // for @HandleTypes we need interface impl, impl of abstract classes too
             annotationFinder.enableFindSubclasses();
             annotationFinder.enableFindImplementations();
         }
-
-        return annotationFinder;
     }
 
     private static boolean enableFindSubclasses() {



Mime
View raw message