Repository: tomee Updated Branches: refs/heads/master cf5ed054f -> bdbc90564
TOMEE-2103 forcing annotated mode by default with tomee embedded Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bdbc9056 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bdbc9056 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bdbc9056 Branch: refs/heads/master Commit: bdbc90564fb5b69b80d93313806c1f5c0bee3461 Parents: cf5ed05 Author: Romain Manni-Bucau <rmannibu...@gmail.com> Authored: Wed Jul 26 14:32:07 2017 +0200 Committer: Romain Manni-Bucau <rmannibu...@gmail.com> Committed: Wed Jul 26 14:33:02 2017 +0200 ---------------------------------------------------------------------- .../org/apache/tomee/embedded/Container.java | 21 ++++++++++++++++++++ 1 file changed, 21 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/bdbc9056/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 06c9290..3ed2737 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 @@ -39,6 +39,7 @@ import org.apache.openejb.UndeployException; import org.apache.openejb.assembler.WebAppDeployer; import org.apache.openejb.assembler.classic.AppInfo; 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.WebAppInfo; @@ -887,6 +888,26 @@ public class Container implements AutoCloseable { } } else { 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.beans == null) { + if (!jar.enterpriseBeans.isEmpty()) { + jar.beans = new BeansInfo(); + jar.beans.version = "1.1"; + jar.beans.discoveryMode = "annotated"; + final BeansInfo.BDAInfo info = new BeansInfo.BDAInfo(); + info.discoveryMode = "annotated"; + info.uri = jar.moduleUri; + jar.beans.noDescriptorBdas.add(info); + for (final EnterpriseBeanInfo bean : jar.enterpriseBeans) { + if (bean.ejbClass == null) { + continue; + } + info.managedClasses.add(bean.ejbClass); + } + } + } + } if (overrideName) { appInfo.appId = name; for (final EjbJarInfo ejbJar : appInfo.ejbJars) {
