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/04/30 19:59:58 UTC

tomee git commit: org.apache.openejb.jpa.integration.eclipselink should be loaded from the webapp if possible and not app loader

Repository: tomee
Updated Branches:
  refs/heads/master a3aa977b4 -> 28deb4cec


org.apache.openejb.jpa.integration.eclipselink should be loaded from the webapp if possible and not app loader


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

Branch: refs/heads/master
Commit: 28deb4cecfbfbfcb16789e634f4c44a67c6202be
Parents: a3aa977
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Sat Apr 30 19:59:35 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Sat Apr 30 19:59:35 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/tomee/catalina/TomEEWebappClassLoader.java     | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/28deb4ce/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
index b606e8d..3c184a4 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
@@ -138,6 +138,8 @@ public class TomEEWebappClassLoader extends ParallelWebappClassLoader {
         if ("org.apache.openejb.hibernate.OpenEJBJtaPlatform".equals(name)
                 || "org.apache.openejb.jpa.integration.hibernate.PrefixNamingStrategy".equals(name)
                 || "org.apache.openejb.jpa.integration.eclipselink.PrefixSessionCustomizer".equals(name)
+                || "org.apache.openejb.jpa.integration.eclipselink.OpenEJBServerPlatform".equals(name)
+                || "org.apache.openejb.jpa.integration.eclipselink.OpenEJBServerPlatform$OpenEJBJTATransactionController".equals(name)
                 || "org.apache.openejb.eclipselink.JTATransactionController".equals(name)
                 || "org.apache.tomee.mojarra.TomEEInjectionProvider".equals(name)) {
             // don't load them from system classloader (breaks all in embedded mode and no sense in other cases)