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 2012/12/05 14:20:35 UTC
svn commit: r1417410 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
Author: rmannibucau
Date: Wed Dec 5 13:20:34 2012
New Revision: 1417410
URL: http://svn.apache.org/viewvc?rev=1417410&view=rev
Log:
allowing to load our arquillian classes from webapp (of course ;)) + using openejb classloader instead of parent one when skipping loadclass in webappclasslaoder
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java?rev=1417410&r1=1417409&r2=1417410&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java Wed Dec 5 13:20:34 2012
@@ -317,7 +317,8 @@ public class URLClassLoaderFirst extends
// in org.apache.openejb.
private static boolean isWebAppEnrichment(final String openejb) {
return openejb.startsWith("hibernate.") || openejb.startsWith("jpa.integration.")
- || openejb.startsWith("toplink.") || openejb.startsWith("eclipselink.");
+ || openejb.startsWith("toplink.") || openejb.startsWith("eclipselink.")
+ || openejb.startsWith("arquillian.");
}
@Override
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1417410&r1=1417409&r2=1417410&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java Wed Dec 5 13:20:34 2012
@@ -20,6 +20,7 @@ import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.loader.WebappClassLoader;
import org.apache.openejb.ClassLoaderUtil;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.classloader.ClassLoaderConfigurer;
import org.apache.openejb.classloader.WebAppEnricher;
import org.apache.openejb.loader.SystemInstance;
@@ -86,7 +87,7 @@ public class LazyStopWebappClassLoader e
// avoid to redefine classes from server in this classloader is it not already loaded
if (URLClassLoaderFirst.shouldSkip(name)) {
- return getParent().loadClass(name);
+ return OpenEJB.class.getClassLoader().loadClass(name);
}
return super.loadClass(name);
}