Author: cziegeler
Date: Mon Sep 19 06:48:20 2016
New Revision: 1761388
URL: http://svn.apache.org/viewvc?rev=1761388&view=rev
Log:
Merge changes from trunk
Modified:
felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/AbstractActivator.java
felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/AbstractHttpActivator.java
felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
Modified:
felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/AbstractActivator.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/AbstractActivator.java?rev=1761388&r1=1761387&r2=1761388&view=diff
==============================================================================
---
felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/AbstractActivator.java
(original)
+++
felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/AbstractActivator.java
Mon Sep 19 06:48:20 2016
@@ -16,10 +16,10 @@
*/
package org.apache.felix.http.base.internal;
+import org.apache.felix.http.base.internal.logger.LogServiceLogger;
+import org.apache.felix.http.base.internal.logger.SystemLogger;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.apache.felix.http.base.internal.logger.SystemLogger;
-import org.apache.felix.http.base.internal.logger.LogServiceLogger;
public abstract class AbstractActivator
implements BundleActivator
@@ -32,6 +32,7 @@ public abstract class AbstractActivator
return this.context;
}
+ @Override
public final void start(BundleContext context)
throws Exception
{
@@ -41,6 +42,7 @@ public abstract class AbstractActivator
doStart();
}
+ @Override
public final void stop(BundleContext context)
throws Exception
{
@@ -52,5 +54,5 @@ public abstract class AbstractActivator
throws Exception;
protected abstract void doStop()
- throws Exception;
+ throws Exception;
}
Modified:
felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/AbstractHttpActivator.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/AbstractHttpActivator.java?rev=1761388&r1=1761387&r2=1761388&view=diff
==============================================================================
---
felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/AbstractHttpActivator.java
(original)
+++
felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/AbstractHttpActivator.java
Mon Sep 19 06:48:20 2016
@@ -19,20 +19,8 @@ package org.apache.felix.http.base.inter
public abstract class AbstractHttpActivator
extends AbstractActivator
{
- private DispatcherServlet dispatcherServlet;
- private EventDispatcher eventDispatcher;
private HttpServiceController controller;
- protected final DispatcherServlet getDispatcherServlet()
- {
- return this.dispatcherServlet;
- }
-
- protected final EventDispatcher getEventDispatcher()
- {
- return this.eventDispatcher;
- }
-
protected final HttpServiceController getHttpServiceController()
{
return this.controller;
@@ -43,8 +31,6 @@ public abstract class AbstractHttpActiva
throws Exception
{
this.controller = new HttpServiceController(getBundleContext());
- this.dispatcherServlet = new
DispatcherServlet(this.controller.getDispatcher());
- this.eventDispatcher = new EventDispatcher(this.controller);
}
@Override
@@ -52,6 +38,5 @@ public abstract class AbstractHttpActiva
throws Exception
{
this.controller.unregister();
- this.dispatcherServlet.destroy();
}
}
Modified:
felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java?rev=1761388&r1=1761387&r2=1761388&view=diff
==============================================================================
---
felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
(original)
+++
felix/sandbox/http-base-r7/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
Mon Sep 19 06:48:20 2016
@@ -37,20 +37,41 @@ public final class HttpServiceController
private final BundleContext bundleContext;
private final HandlerRegistry registry;
private final Dispatcher dispatcher;
+ private final DispatcherServlet dispatcherServlet;
+ private final EventDispatcher eventDispatcher;
private final HttpServiceFactory httpServiceFactory;
private final WhiteboardManager whiteboardManager;
private volatile HttpSessionListener httpSessionListener;
+
+ public DispatcherServlet getDispatcherServlet()
+ {
+ return this.dispatcherServlet;
+ }
+
+ public EventDispatcher getEventDispatcher()
+ {
+ return this.eventDispatcher;
+ }
+
public HttpServiceController(final BundleContext bundleContext)
{
this.bundleContext = bundleContext;
this.registry = new HandlerRegistry();
this.dispatcher = new Dispatcher(this.registry);
+ this.dispatcherServlet = new DispatcherServlet(this.dispatcher);
+ this.eventDispatcher = new EventDispatcher(this);
this.httpServiceFactory = new HttpServiceFactory(this.bundleContext,
this.registry);
this.whiteboardManager = new WhiteboardManager(bundleContext,
this.httpServiceFactory, this.registry);
}
+ public void stop()
+ {
+ this.unregister();
+ this.dispatcherServlet.destroy();
+ }
+
public Dispatcher getDispatcher()
{
return this.dispatcher;
