Repository: tomee
Updated Branches:
  refs/heads/master bdbc90564 -> c54c0eaf5


ignore @EjbModule in previous commit logic


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c54c0eaf
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c54c0eaf
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c54c0eaf

Branch: refs/heads/master
Commit: c54c0eaf565bd9bec46aa386c6767e4fd2224b59
Parents: bdbc905
Author: Romain Manni-Bucau <rmannibu...@gmail.com>
Authored: Wed Jul 26 18:09:27 2017 +0200
Committer: Romain Manni-Bucau <rmannibu...@gmail.com>
Committed: Wed Jul 26 18:09:27 2017 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/tomee/embedded/Container.java    | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/c54c0eaf/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
----------------------------------------------------------------------
diff --git 
a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java 
b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
index 3ed2737..cb745a3 100644
--- 
a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
+++ 
b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
@@ -42,6 +42,7 @@ import org.apache.openejb.assembler.classic.Assembler;
 import org.apache.openejb.assembler.classic.BeansInfo;
 import org.apache.openejb.assembler.classic.EjbJarInfo;
 import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
+import org.apache.openejb.assembler.classic.ManagedBeanInfo;
 import org.apache.openejb.assembler.classic.WebAppInfo;
 import org.apache.openejb.config.AnnotationDeployer;
 import org.apache.openejb.config.AppModule;
@@ -890,6 +891,12 @@ public class Container implements AutoCloseable {
             appInfo = configurationFactory.configureApplication(file);
             // ensure to activate CDI for classpath deployment, we can desire 
to move it but it breaks less apps this way
             for (final EjbJarInfo jar : appInfo.ejbJars) {
+                if (jar.enterpriseBeans.size() == 1) {
+                    final EnterpriseBeanInfo next = 
jar.enterpriseBeans.iterator().next();
+                    if (ManagedBeanInfo.class.isInstance(next) && 
ManagedBeanInfo.class.cast(next).hidden) {
+                        continue;
+                    }
+                }
                 if (jar.beans == null) {
                     if (!jar.enterpriseBeans.isEmpty()) {
                         jar.beans = new BeansInfo();

Reply via email to