svn commit: r1188358 - /openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

[rm...@apache.org]

Author: rmannibucau
Date: Mon Oct 24 20:25:52 2011
New Revision: 1188358

URL: http://svn.apache.org/viewvc?rev=1188358&view=rev
Log:
TOMEE-42 using openejb classlaoder as parent classloader instead of catalina one

Modified:
    openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1188358&r1=1188357&r2=1188358&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Mon Oct 24 20:25:52 2011
@@ -35,17 +35,15 @@ import org.apache.catalina.deploy.Contex
 import org.apache.catalina.deploy.ContextResourceLink;
 import org.apache.catalina.deploy.ContextTransaction;
 import org.apache.catalina.deploy.NamingResources;
-import org.apache.catalina.startup.Catalina;
 import org.apache.catalina.startup.Constants;
 import org.apache.catalina.startup.ContextConfig;
-import org.apache.catalina.startup.ContextRuleSet;
 import org.apache.catalina.startup.HostConfig;
 import org.apache.catalina.startup.RealmRuleSet;
-import org.apache.catalina.startup.SetNextNamingRule;
 import org.apache.naming.ContextAccessController;
 import org.apache.naming.ContextBindings;
 import org.apache.openejb.AppContext;
 import org.apache.openejb.Injection;
+import org.apache.openejb.OpenEJB;
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.assembler.classic.AppInfo;
 import org.apache.openejb.assembler.classic.Assembler;
@@ -312,9 +310,8 @@ public class TomcatWebAppBuilder impleme
                 if (standardContext.getDocBase() != null && standardContext.getDocBase().endsWith(".war")) {
                     standardContext.setDocBase(standardContext.getDocBase().substring(0, standardContext.getDocBase().length() - 4));
                 }
-                // standardContext.setParentClassLoader(classLoader); // don't do it to avoid duplicated things in the classloader
-                standardContext.setParentClassLoader(Catalina.class.getClassLoader());
-                standardContext.setDelegate(true);
+                standardContext.setParentClassLoader(OpenEJB.class.getClassLoader());
+                standardContext.setDelegate(false);
 
                 String host = webApp.host;
                 if (host == null) {
@@ -456,6 +453,8 @@ public class TomcatWebAppBuilder impleme
     public void init(StandardContext standardContext) {
         standardContext.setCrossContext(Boolean.parseBoolean(System.getProperty(OPENEJB_CROSSCONTEXT_PROPERTY, "false")));
         standardContext.setNamingResources(new OpenEJBNamingResource());
+        standardContext.setParentClassLoader(OpenEJB.class.getClassLoader());
+        standardContext.setDelegate(false);
 
         if (standardContext.getConfigFile() == null) {
             String s = File.pathSeparator;