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

[rmannibucau]

Author: rmannibucau
Date: Mon Oct 24 17:46:49 2011
New Revision: 1188254

URL: http://svn.apache.org/viewvc?rev=1188254&view=rev
Log:
TOMEE-42 using catalina classloader as parent one for webapps created by TomEE 
itself

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=1188254&r1=1188253&r2=1188254&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 17:46:49 2011
@@ -35,6 +35,7 @@ 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;
@@ -311,10 +312,10 @@ 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);
+                // standardContext.setParentClassLoader(classLoader); // don't 
do it to avoid duplicated things in the classloader
+                
standardContext.setParentClassLoader(Catalina.class.getClassLoader());
                 standardContext.setDelegate(true);
 
-
                 String host = webApp.host;
                 if (host == null) {
                     host = "localhost";