You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/04/08 08:02:37 UTC
svn commit: r931792 -
/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/annotation/WebListenerAnnotationMergeHandler.java
Author: xuhaihong
Date: Thu Apr 8 06:02:37 2010
New Revision: 931792
URL: http://svn.apache.org/viewvc?rev=931792&view=rev
Log:
GERONIMO-5037 Add missing support for AsyncListener
Modified:
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/annotation/WebListenerAnnotationMergeHandler.java
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/annotation/WebListenerAnnotationMergeHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/annotation/WebListenerAnnotationMergeHandler.java?rev=931792&r1=931791&r2=931792&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/annotation/WebListenerAnnotationMergeHandler.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/annotation/WebListenerAnnotationMergeHandler.java Thu Apr 8 06:02:37 2010
@@ -39,7 +39,7 @@ import org.apache.geronimo.xbeans.javaee
public class WebListenerAnnotationMergeHandler implements AnnotationMergeHandler {
public static final Class<?>[] SUPPORTED_WEBLISTENER_INTERFACES = { ServletContextListener.class, ServletContextAttributeListener.class, ServletRequestListener.class,
- ServletRequestAttributeListener.class, HttpSessionListener.class, HttpSessionAttributeListener.class };
+ ServletRequestAttributeListener.class, HttpSessionListener.class, HttpSessionAttributeListener.class, javax.servlet.AsyncListener.class };
@Override
public void merge(Class<?>[] classes, WebAppType webApp, MergeContext mergeContext) throws DeploymentException {
@@ -76,7 +76,6 @@ public class WebListenerAnnotationMergeH
@Override
public void postProcessWebXmlElement(WebAppType webApp, MergeContext mergeContext) throws DeploymentException {
// TODO Auto-generated method stub
-
}
/* (non-Javadoc)
@@ -85,6 +84,5 @@ public class WebListenerAnnotationMergeH
@Override
public void preProcessWebXmlElement(WebAppType webApp, MergeContext mergeContext) throws DeploymentException {
// TODO Auto-generated method stub
-
}
}