Repository: tomee Updated Branches: refs/heads/develop ffbc98c91 -> 72d0e5355
correct counting of modules in app composer Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/72d0e535 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/72d0e535 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/72d0e535 Branch: refs/heads/develop Commit: 72d0e535502ffc320bdedae15013ecdc919947f7 Parents: ffbc98c Author: Romain Manni-Bucau <[email protected]> Authored: Sun Feb 22 23:29:37 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Sun Feb 22 23:29:37 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/openejb/testing/ApplicationComposers.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/72d0e535/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java index 391ba7f..3c135a9 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java @@ -410,10 +410,12 @@ public class ApplicationComposers { final Jars globalJarsAnnotation = testClass.getAnnotation(Jars.class); // Invoke the @Module producer methods to build out the AppModule + int moduleNumber = 0; final Map<Object, List<Method>> moduleMethods = new HashMap<>(); findAnnotatedMethods(moduleMethods, Module.class); findAnnotatedMethods(moduleMethods, org.apache.openejb.junit.Module.class); for (final Map.Entry<Object, List<Method>> methods : moduleMethods.entrySet()) { + moduleNumber += methods.getValue().size(); for (final Method method : methods.getValue()) { final Object obj = method.invoke(methods.getKey()); final Jars jarsAnnotation = method.getAnnotation(Jars.class); @@ -612,6 +614,8 @@ public class ApplicationComposers { appModule.getAdditionalLibraries().addAll(module.getAdditionalLibraries()); appModule.getAltDDs().putAll(module.getAltDDs()); appModule.getProperties().putAll(module.getProperties()); + } else { + moduleNumber--; } } } @@ -627,6 +631,7 @@ public class ApplicationComposers { classClasses.cdiInterceptors(), classClasses.cdiAlternatives(), classClasses.cdiDecorators(), classClasses.cdi(), classClasses.innerClassesAsBean(), testClass.getAnnotation(Default.class) != null); webModulesNb++; + moduleNumber++; } // Application is final in AppModule, which is fine, so we'll create a new one and move everything @@ -671,7 +676,7 @@ public class ApplicationComposers { } } - if (moduleMethods.size() == 1 && webModulesNb == 1) { + if (moduleNumber == 1 && webModulesNb == 1) { appModule.setStandloneWebModule(); }
