svn commit: r1569143 - in /tomee/tomee/trunk: pom.xml tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java

[rmannibucau]

Author: rmannibucau
Date: Mon Feb 17 23:34:15 2014
New Revision: 1569143

URL: http://svn.apache.org/r1569143
Log:
TOMEE-1104 tomcat 7.0.52

Modified:
    tomee/tomee/trunk/pom.xml
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java

Modified: tomee/tomee/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1569143&r1=1569142&r2=1569143&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Mon Feb 17 23:34:15 2014
@@ -121,7 +121,7 @@
 
     <jaxb.version>2.2.6</jaxb.version>
 
-    <tomcat.version>7.0.50</tomcat.version>
+    <tomcat.version>7.0.52</tomcat.version>
 
     <!-- used mainly by jetty modules -->
     <cxf.version>2.6.11</cxf.version>

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1569143&r1=1569142&r2=1569143&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
 Mon Feb 17 23:34:15 2014
@@ -21,6 +21,7 @@ import org.apache.catalina.loader.Webapp
 import org.apache.openejb.OpenEJB;
 import org.apache.openejb.classloader.ClassLoaderConfigurer;
 import org.apache.openejb.classloader.WebAppEnricher;
+import org.apache.openejb.config.NewLoaderLogic;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
@@ -30,7 +31,11 @@ import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Enumeration;
+import java.util.Iterator;
 
 public class LazyStopWebappClassLoader extends WebappClassLoader {
     private static final Logger LOGGER = 
Logger.getInstance(LogCategory.OPENEJB, 
LazyStopWebappClassLoader.class.getName());
@@ -204,6 +209,16 @@ public class LazyStopWebappClassLoader e
 
     @Override
     public Enumeration<URL> getResources(final String name) throws IOException 
{
+        if 
("META-INF/services/javax.servlet.ServletContainerInitializer".equals(name)) {
+            final Collection<URL> list = new 
ArrayList<URL>(Collections.list(super.getResources(name)));
+            final Iterator<URL> it = list.iterator();
+            while (it.hasNext()) {
+                if (NewLoaderLogic.skip(it.next())) {
+                    it.remove();
+                }
+            }
+            return Collections.enumeration(list);
+        }
         return URLClassLoaderFirst.filterResources(name, 
super.getResources(name));
     }
 

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1569143&r1=1569142&r2=1569143&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
 Mon Feb 17 23:34:15 2014
@@ -60,6 +60,7 @@ import org.apache.tomee.loader.TomcatHel
 import org.apache.xbean.finder.IAnnotationFinder;
 
 import javax.servlet.ServletContainerInitializer;
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServlet;
 import javax.ws.rs.core.Application;
 import java.io.ByteArrayInputStream;
@@ -412,10 +413,10 @@ public class OpenEJBContextConfig extend
     }
 
     @Override // called before processAnnotationsFile so using it as hook to 
init webInfClassesAnnotationsProcessed
-    protected void processServletContainerInitializers(final Set<WebXml> 
fragments) {
+    protected void processServletContainerInitializers(final ServletContext 
ctx) {
         webInfClassesAnnotationsProcessed = false;
         try {
-            super.processServletContainerInitializers(fragments);
+            super.processServletContainerInitializers(ctx);
 
             final ClassLoader loader = context.getLoader().getClassLoader();