svn commit: r1599482 - in /felix/sandbox/http-rfc189/base/src/main/java/org/apache/felix/http/base/internal: HttpServiceController.java listener/AsyncListenerManager.java

[cz...@apache.org]

Author: cziegeler
Date: Tue Jun  3 11:39:34 2014
New Revision: 1599482

URL: http://svn.apache.org/r1599482
Log:
FELIX-4526 : Update RFC189 (HttpService) implementation. Apply patch from Simone Tripodi

Removed:
    felix/sandbox/http-rfc189/base/src/main/java/org/apache/felix/http/base/internal/listener/AsyncListenerManager.java
Modified:
    felix/sandbox/http-rfc189/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java

Modified: felix/sandbox/http-rfc189/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
URL: http://svn.apache.org/viewvc/felix/sandbox/http-rfc189/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java?rev=1599482&r1=1599481&r2=1599482&view=diff
==============================================================================
--- felix/sandbox/http-rfc189/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java (original)
+++ felix/sandbox/http-rfc189/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java Tue Jun  3 11:39:34 2014
@@ -16,19 +16,16 @@
  */
 package org.apache.felix.http.base.internal;
 
-import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.servlet.AsyncListener;
 import javax.servlet.ServletContext;
 
 import org.apache.felix.http.api.ExtHttpService;
 import org.apache.felix.http.base.internal.dispatch.Dispatcher;
 import org.apache.felix.http.base.internal.handler.HandlerRegistry;
 import org.apache.felix.http.base.internal.handler.HttpServicePlugin;
-import org.apache.felix.http.base.internal.listener.AsyncListenerManager;
 import org.apache.felix.http.base.internal.listener.HttpSessionAttributeListenerManager;
 import org.apache.felix.http.base.internal.listener.HttpSessionListenerManager;
 import org.apache.felix.http.base.internal.listener.ServletContextAttributeListenerManager;
@@ -73,7 +70,6 @@ public final class HttpServiceController
     private final ServletRequestAttributeListenerManager requestAttributeListener;
     private final HttpSessionListenerManager sessionListener;
     private final HttpSessionAttributeListenerManager sessionAttributeListener;
-    private final AsyncListenerManager asyncListener;
     private final ServletContextListenerManager servletContextListener;
     private final boolean sharedContextAttributes;
     private final HttpServicePlugin plugin;
@@ -91,8 +87,6 @@ public final class HttpServiceController
         this.requestAttributeListener = register(new ServletRequestAttributeListenerManager(bundleContext));
         this.sessionListener = register(new HttpSessionListenerManager(bundleContext));
         this.sessionAttributeListener = register(new HttpSessionAttributeListenerManager(bundleContext));
-        this.asyncListener = register(new AsyncListenerManager(bundleContext));
-        bundleContext.registerService(AsyncListener.class.getName(), this.asyncListener, new Hashtable<String, Object>());
         this.servletContextListener = register(new ServletContextListenerManager(bundleContext));
         this.sharedContextAttributes = getBoolean(FELIX_HTTP_SHARED_SERVLET_CONTEXT_ATTRIBUTES);
         this.plugin = new HttpServicePlugin(bundleContext, registry);
@@ -134,11 +128,6 @@ public final class HttpServiceController
         return sessionAttributeListener;
     }
 
-    public AsyncListenerManager getAsyncListener()
-    {
-        return asyncListener;
-    }
-
     public ServletContextListenerManager getServletContextListener()
     {
         return servletContextListener;