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/10/04 11:58:01 UTC

svn commit: r1393974 - in /openejb/trunk/openejb/tomee: tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java tomee-myfaces/pom.xml

Author: rmannibucau
Date: Thu Oct  4 09:57:59 2012
New Revision: 1393974

URL: http://svn.apache.org/viewvc?rev=1393974&view=rev
Log:
TOMEE-439 TCK needs delegate for webappclassloader

Removed:
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
Modified:
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
    openejb/trunk/openejb/tomee/tomee-myfaces/pom.xml

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1393974&r1=1393973&r2=1393974&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Thu Oct  4 09:57:59 2012
@@ -437,7 +437,7 @@ public class TomcatWebAppBuilder impleme
                 // but here we have all the classloading logic
                 if (classLoader != null) {
                     standardContext.setParentClassLoader(classLoader);
-                    //standardContext.setDelegate(true);
+                    standardContext.setDelegate(true);
                     //standardContext.setLoader(new TomEEWebappLoader(appInfo.path, classLoader));
                     //standardContext.getLoader().setDelegate(true);
                 }

Modified: openejb/trunk/openejb/tomee/tomee-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-myfaces/pom.xml?rev=1393974&r1=1393973&r2=1393974&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-myfaces/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-myfaces/pom.xml Thu Oct  4 09:57:59 2012
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-catalina</artifactId>
-      <version>7.0.29</version>
+      <version>${tomcat.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>