geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1026215 - in /geronimo/external/trunk/tomcat-parent-7.0.0: catalina/src/main/java/org/apache/catalina/core/ApplicationContext.java pom.xml tribes/pom.xml
Date Fri, 22 Oct 2010 05:20:11 GMT
Author: xuhaihong
Date: Fri Oct 22 05:20:11 2010
New Revision: 1026215

URL: http://svn.apache.org/viewvc?rev=1026215&view=rev
Log:
a. GERONIMO-5616 add dynamic import org.apache.catalina.*
b. Geronimo's external fix for AsyncListener

Modified:
    geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/ApplicationContext.java
    geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml
    geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml

Modified: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/ApplicationContext.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/ApplicationContext.java?rev=1026215&r1=1026214&r2=1026215&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/ApplicationContext.java
Fri Oct 22 05:20:11 2010
@@ -38,6 +38,7 @@ import java.util.concurrent.ConcurrentHa
 import javax.naming.Binding;
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
+import javax.servlet.AsyncListener;
 import javax.servlet.Filter;
 import javax.servlet.FilterRegistration;
 import javax.servlet.RequestDispatcher;
@@ -1302,6 +1303,10 @@ public class ApplicationContext
             match = true;
         }
         
+        if (t instanceof AsyncListener) {
+            match = true;
+        }
+        
         if (match) return;
         
         if (t instanceof ServletContextListener) {

Modified: geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml?rev=1026215&r1=1026214&r2=1026215&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml Fri Oct 22 05:20:11 2010
@@ -30,7 +30,7 @@
     <version>7.0.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>Apache Geronimo Tomcat Fork 6.0.20</name>
+    <name>Apache Geronimo Tomcat Fork 7.0.0</name>
     <description>Mavenized tomcat build</description>
 
     <!-- instructions:

Modified: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml?rev=1026215&r1=1026214&r2=1026215&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml Fri Oct 22 05:20:11 2010
@@ -45,7 +45,9 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
-                    <instructions></instructions>
+                    <instructions>
+                        <DynamicImport-Package>org.apache.catalina.*</DynamicImport-Package>
+                    </instructions>
                 </configuration>
             </plugin>
         </plugins>



Mime
View raw message