You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/08/23 14:09:49 UTC
[3/5] tomee git commit: Whitelist MP jars for scanning instead of all
jars. Caused issues with some CXF stuff.
Whitelist MP jars for scanning instead of all jars. Caused issues with some CXF stuff.
(cherry picked from commit abfc263)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/23f44b17
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/23f44b17
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/23f44b17
Branch: refs/heads/master
Commit: 23f44b17e6ab504561f32aa4ae92f2521e07261e
Parents: 7d30cde
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Aug 21 12:04:40 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Thu Aug 23 12:55:35 2018 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/config/DeploymentLoader.java | 2 +-
.../src/main/java/org/apache/tomee/installer/Installer.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/23f44b17/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
----------------------------------------------------------------------
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 4d9bffb..d0ebfe3 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
@@ -1108,7 +1108,7 @@ public class DeploymentLoader implements DeploymentFilterable {
try {
UrlSet urlSet = new UrlSet(ParentClassLoaderFinder.Helper.get());
urlSet = URLs.cullSystemJars(urlSet);
- final PatternFilter containerIncludes = new PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_INCLUDES, ".*"));
+ final PatternFilter containerIncludes = new PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_INCLUDES, ".*(geronimo|mp-jwt|failsafe).*"));
final PatternFilter containerExcludes = new PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_EXCLUDES, ""));
urlSet = NewLoaderLogic.applyBuiltinExcludes(urlSet, containerIncludes, containerExcludes);
containerUrls = urlSet.getUrls();
http://git-wip-us.apache.org/repos/asf/tomee/blob/23f44b17/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 301dfd5..40422f1 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -788,6 +788,13 @@ public class Installer implements InstallerInterface {
systemPropertiesWriter.write("# javax.xml.soap.SOAPFactory = com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl\n");
systemPropertiesWriter.write("# javax.xml.soap.SOAPConnectionFactory = com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory\n");
systemPropertiesWriter.write("# javax.xml.soap.MetaFactory = com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl\n");
+
+ systemPropertiesWriter.write("#\n");
+ systemPropertiesWriter.write("# Which paths / libraries should be scanned?\n");
+ systemPropertiesWriter.write("openejb.scan.webapp.container = true\n");
+ systemPropertiesWriter.write("openejb.scan.webapp.container.includes = .*(geronimo|mp-jwt|failsafe).*\n");
+ systemPropertiesWriter.write("openejb.scan.webapp.container.excludes = \n");
+
} catch (final IOException e) {
// ignored, this file is far to be mandatory
} finally {