tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgallim...@apache.org
Subject [1/5] tomee git commit: Whitelist MP jars for scanning instead of all jars. Caused issues with some CXF stuff.
Date Thu, 23 Aug 2018 14:09:47 GMT
Repository: tomee
Updated Branches:
  refs/heads/master 7d30cdef3 -> af767dcc0


Whitelist MP jars for scanning instead of all jars. Caused issues with some CXF stuff.


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

Branch: refs/heads/master
Commit: c12d64a2c3e5a32fa64cea19a26df26a1abf92cc
Parents: 7d30cde
Author: Roberto Cortez <radcortez@yahoo.com>
Authored: Tue Aug 21 12:04:40 2018 +0100
Committer: Jonathan Gallimore <jgallimore@tomitribe.com>
Committed: Wed Aug 22 10:16:49 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/c12d64a2/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/c12d64a2/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 {


Mime
View raw message