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 9f7bb13f9d0b8ae11a311313d3963f6d3186dcc8 Author: Roberto Cortez <radcor...@yahoo.com> AuthorDate: Mon Feb 4 23:40:11 2019 +0000 TOMEE-2408 - Fixed problem where MP libraries were being scanned even when disable with the flag openejb.scan.webapp.container = true. --- .../org/apache/openejb/config/DeploymentLoader.java | 9 +++++---- ...lScanEvent.java => EnhanceScannableUrlsEvent.java} | 19 ++++++++----------- .../src/main/resources/default.exclusions | 7 ++----- .../tomee/microprofile/TomEEMicroProfileListener.java | 6 +++--- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java index d68649c..19872a0 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java @@ -25,8 +25,8 @@ import org.apache.openejb.api.RemoteClient; import org.apache.openejb.cdi.CompositeBeans; import org.apache.openejb.classloader.ClassLoaderConfigurer; import org.apache.openejb.classloader.WebAppEnricher; -import org.apache.openejb.config.event.AfterContainerUrlScanEvent; import org.apache.openejb.config.event.BeforeDeploymentEvent; +import org.apache.openejb.config.event.EnhanceScannableUrlsEvent; import org.apache.openejb.config.sys.Resources; import org.apache.openejb.core.EmptyResourcesClassLoader; import org.apache.openejb.core.ParentClassLoaderFinder; @@ -1068,6 +1068,7 @@ public class DeploymentLoader implements DeploymentFilterable { } } + SystemInstance.get().fireEvent(new EnhanceScannableUrlsEvent(scannableUrls)); final WebModule webModule = new WebModule(webApp, contextRoot, warClassLoader, warFile.getAbsolutePath(), moduleName); webModule.setUrls(webUrls); @@ -1131,8 +1132,6 @@ public class DeploymentLoader implements DeploymentFilterable { containerUrls = new ArrayList<>(); } } - - SystemInstance.get().fireEvent(new AfterContainerUrlScanEvent(containerUrls)); } public static List<URL> filterWebappUrls(final URL[] webUrls, final Filter filter, final URL exclusions) { @@ -1244,7 +1243,9 @@ public class DeploymentLoader implements DeploymentFilterable { complete.removeDuplicates(); ensureContainerUrls(); - appModule.getScannableContainerUrls().addAll(containerUrls); + final List<URL> scannableUrls = new ArrayList<>(this.containerUrls); + SystemInstance.get().fireEvent(new EnhanceScannableUrlsEvent(scannableUrls)); + appModule.getScannableContainerUrls().addAll(scannableUrls); IAnnotationFinder finder; try { diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/event/AfterContainerUrlScanEvent.java b/container/openejb-core/src/main/java/org/apache/openejb/config/event/EnhanceScannableUrlsEvent.java similarity index 70% rename from container/openejb-core/src/main/java/org/apache/openejb/config/event/AfterContainerUrlScanEvent.java rename to container/openejb-core/src/main/java/org/apache/openejb/config/event/EnhanceScannableUrlsEvent.java index 2594e06..1a741e6 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/event/AfterContainerUrlScanEvent.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/event/EnhanceScannableUrlsEvent.java @@ -16,27 +16,24 @@ */ package org.apache.openejb.config.event; -import org.apache.openejb.observer.Event; - import java.net.URL; import java.util.List; -@Event -public class AfterContainerUrlScanEvent { - private List<URL> containerUrls; +public class EnhanceScannableUrlsEvent { + private List<URL> scannableUrls; - public AfterContainerUrlScanEvent(final List<URL> containerUrls) { - this.containerUrls = containerUrls; + public EnhanceScannableUrlsEvent(final List<URL> scannableUrls) { + this.scannableUrls = scannableUrls; } - public List<URL> getContainerUrls() { - return containerUrls; + public List<URL> getScannableUrls() { + return scannableUrls; } @Override public String toString() { - return "AfterContainerUrlScanEvent{" + - "containerUrls=" + containerUrls + + return "EnhanceScannableUrlsEvent{" + + "scannableUrls=" + scannableUrls + '}'; } } diff --git a/container/openejb-core/src/main/resources/default.exclusions b/container/openejb-core/src/main/resources/default.exclusions index 624509b..ad8faad 100644 --- a/container/openejb-core/src/main/resources/default.exclusions +++ b/container/openejb-core/src/main/resources/default.exclusions @@ -81,11 +81,7 @@ jfxrt.jar jnr- johnzon- fusemq-leveldb- -geronimo-connector -geronimo-j2ee- -geronimo-jpa_ -geronimo-javamail -geronimo-transaction +geronimo- google- gragent.jar groovy- @@ -214,6 +210,7 @@ rmock- rt.jar saaj- sac- +safeguard- scala-library- scalatest scannotation- diff --git a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileListener.java b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileListener.java index 819b67c..5ac0905 100644 --- a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileListener.java +++ b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileListener.java @@ -22,7 +22,7 @@ import org.apache.geronimo.microprofile.metrics.common.jaxrs.MetricsEndpoints; import org.apache.geronimo.microprofile.metrics.jaxrs.CdiMetricsEndpoints; import org.apache.geronimo.microprofile.openapi.jaxrs.OpenAPIEndpoint; import org.apache.openejb.assembler.classic.WebAppInfo; -import org.apache.openejb.config.event.AfterContainerUrlScanEvent; +import org.apache.openejb.config.event.EnhanceScannableUrlsEvent; import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.observer.Observes; import org.apache.openejb.observer.event.BeforeEvent; @@ -63,7 +63,7 @@ public class TomEEMicroProfileListener { }; @SuppressWarnings("Duplicates") - public void enrichContainerWithMicroProfile(@Observes final AfterContainerUrlScanEvent afterContainerUrlScanEvent) { + public void enhanceScannableUrls(@Observes final EnhanceScannableUrlsEvent enhanceScannableUrlsEvent) { final String mpScan = SystemInstance.get().getOptions().get("tomee.mp.scan", "none"); if (mpScan.equals("none")) { @@ -73,7 +73,7 @@ public class TomEEMicroProfileListener { return; } - final List<URL> containerUrls = afterContainerUrlScanEvent.getContainerUrls(); + final List<URL> containerUrls = enhanceScannableUrlsEvent.getScannableUrls(); final Paths paths = new Paths(new File(System.getProperty("openejb.home"))); for (final String prefix : MICROPROFILE_LIBS_IMPLS_PREFIXES) { final File file = paths.findTomEELibJar(prefix);