Repository: tomee Updated Branches: refs/heads/master 7910e862d -> f7227fa62
TOMEE-1914 jaxws exclusions for ContainerClassesFilter Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f7227fa6 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f7227fa6 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f7227fa6 Branch: refs/heads/master Commit: f7227fa62d62d31629a2e1a0064d9ac40a8b2497 Parents: 7910e86 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Fri Aug 26 17:42:13 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Fri Aug 26 17:42:13 2016 +0200 ---------------------------------------------------------------------- .../openejb/util/ContainerClassesFilter.java | 26 ++++++++++---------- .../util/classloader/URLClassLoaderFirst.java | 6 +++++ .../config/ContainerClassesFilterTest.java | 1 + 3 files changed, 20 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/f7227fa6/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java b/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java index 221744b..c6901dd 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java @@ -58,8 +58,8 @@ public class ContainerClassesFilter implements Filter { excluded.add("org.apache.velocity"); excluded.add("org.apache.wss4j"); excluded.add("org.apache.commons.logging"); - excluded.add("org.apache.commons.dbcp2."); - excluded.add("org.apache.commons.pool2."); + excluded.add("org.apache.commons.dbcp2"); + excluded.add("org.apache.commons.pool2"); excluded.add("org.metatype.sxc"); excluded.add("org.openejb"); excluded.add("org.slf4j"); @@ -77,17 +77,17 @@ public class ContainerClassesFilter implements Filter { excluded.add("junit"); excluded.add("org.junit"); excluded.add("serp"); - excluded.add("org.terracotta.context."); - excluded.add("org.terracotta.modules.ehcache."); - excluded.add("org.terracotta.statistics."); - excluded.add("org.terracotta.entity."); - excluded.add("org.opensaml."); - excluded.add("org.cryptacular."); - excluded.add("org.bouncycastle."); - excluded.add("org.apache.http."); - excluded.add("net.shibboleth.utilities.java.support."); - excluded.add("com.google.common."); - excluded.add("com.google.thirdparty."); + excluded.add("org.terracotta.context"); + excluded.add("org.terracotta.modules.ehcache"); + excluded.add("org.terracotta.statistics"); + excluded.add("org.terracotta.entity"); + excluded.add("org.opensaml"); + excluded.add("org.cryptacular"); + excluded.add("org.bouncycastle"); + excluded.add("org.apache.http"); + excluded.add("net.shibboleth.utilities.java.support"); + excluded.add("com.google.common"); + excluded.add("com.google.thirdparty"); final Set<String> included = new HashSet<>(); included.add("org.apache.myfaces.cdi"); http://git-wip-us.apache.org/repos/asf/tomee/blob/f7227fa6/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java b/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java index e32c166..bae1052 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java @@ -309,6 +309,9 @@ public class URLClassLoaderFirst extends URLClassLoader { if (commons.startsWith("dbcp.")) { return true; } + if (commons.startsWith("dbcp2.")) { + return true; + } if (commons.startsWith("digester.")) { return true; } @@ -327,6 +330,9 @@ public class URLClassLoaderFirst extends URLClassLoader { if (commons.startsWith("pool.")) { return true; } + if (commons.startsWith("pool2.")) { + return true; + } if (commons.startsWith("net.") && SKIP_COMMONS_NET) { return true; } http://git-wip-us.apache.org/repos/asf/tomee/blob/f7227fa6/container/openejb-core/src/test/java/org/apache/openejb/config/ContainerClassesFilterTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/ContainerClassesFilterTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/ContainerClassesFilterTest.java index 4dbaf30..9adad42 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/config/ContainerClassesFilterTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/config/ContainerClassesFilterTest.java @@ -34,5 +34,6 @@ public class ContainerClassesFilterTest { assertFalse(filter.accept("org.apache.openejb.Bar")); assertFalse(filter.accept("org.apache.openejb.foo.Bar")); assertFalse(filter.accept("org.jasypt.dfzg.Bar")); + assertFalse(filter.accept("org.apache.commons.dbcp2.AbandonedTrace")); } }
