This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch TOMEE-2408 in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 19d2f26d39fafbb86ffb7c1962bfabff211f6add Author: Roberto Cortez <radcor...@yahoo.com> AuthorDate: Wed Jan 23 01:26:53 2019 +0000 TOMEE-2408 - Enable CDI for Tomcat TomEE webapp deployment. --- .../src/main/java/org/apache/openejb/config/ConfigurationFactory.java | 4 ---- tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java index 6fd01d2..ab50cdd 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java @@ -567,10 +567,6 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory { } else { appInfo = configureApplication(new AppModule(SystemApps.getSystemModule())); } - // they doesn't use CDI so no need to activate it - // 1) will be faster - // 2) will let embedded containers (tomee-embedded mainly) not be noised by it in our singleton service - appInfo.properties.put("openejb.cdi.activated", "false"); sys.containerSystem.applications.add(appInfo); } catch (final OpenEJBException e) { logger.error("Unable to load the system applications.", e); diff --git a/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml b/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml index 8a01385..c8e3120 100644 --- a/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml +++ b/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml @@ -19,7 +19,7 @@ <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" - version="3.0" metadata-complete="true"> + version="3.0"> <display-name>Apache TomEE</display-name>