You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/06/06 06:22:09 UTC

tomee git commit: filtering javamail resources too

Repository: tomee
Updated Branches:
  refs/heads/master 0492bf1ed -> 8fa243566


filtering javamail resources too


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

Branch: refs/heads/master
Commit: 8fa243566fcc213fbf025f229d2559b604c4a5a9
Parents: 0492bf1
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Mon Jun 6 08:21:56 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Mon Jun 6 08:21:56 2016 +0200

----------------------------------------------------------------------
 .../openejb/util/classloader/URLClassLoaderFirst.java  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/8fa24356/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 131f5df..96dc950 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
@@ -559,10 +559,21 @@ public class URLClassLoaderFirst extends URLClassLoader {
     public static boolean isFilterableResource(final String name) {
         // currently bean validation, Slf4j, myfaces (because of enrichment)
         return name != null
-            && ("META-INF/services/javax.validation.spi.ValidationProvider".equals(name)
+            && (
+                // bval
+                "META-INF/services/javax.validation.spi.ValidationProvider".equals(name)
+                // jaxrs 2
             || "META-INF/services/javax.ws.rs.client.ClientBuilder".equals(name)
+                // jcache
             || "META-INF/services/javax.cache.spi.CachingProvider".equals(name)
+                // javamail
+            || "META-INF/javamail.default.providers".equals(name)
+            || "META-INF/javamail.default.address.map".equals(name)
+            || "META-INF/javamail.charset.map".equals(name)
+            || "META-INF/mailcap".equals(name)
+                // myfaces
             || name.startsWith("META-INF/services/org.apache.myfaces.spi")
+                // slf4h
             || SLF4J_BINDER_CLASS.equals(name));
     }