You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2022/02/20 14:31:28 UTC
[felix-dev] branch http/jakarta updated: Enable whiteboard and provide runtime service
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch http/jakarta
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/http/jakarta by this push:
new 24c08d9 Enable whiteboard and provide runtime service
24c08d9 is described below
commit 24c08d9716d7d46cc2d20e11b74126c7a306773c
Author: Carsten Ziegeler <cz...@adobe.com>
AuthorDate: Sun Feb 20 15:31:22 2022 +0100
Enable whiteboard and provide runtime service
---
.../base/internal/whiteboard/WhiteboardManager.java | 18 +++++++++++-------
http/jetty/pom.xml | 4 ++++
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
index f565870..7a839e9 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
@@ -59,13 +59,17 @@ import org.apache.felix.http.base.internal.runtime.dto.RegistryRuntime;
import org.apache.felix.http.base.internal.runtime.dto.ServletContextDTOBuilder;
import org.apache.felix.http.base.internal.service.HttpServiceFactory;
import org.apache.felix.http.base.internal.service.HttpServiceRuntimeImpl;
+import org.apache.felix.http.base.internal.whiteboard.tracker.FilterTracker;
import org.apache.felix.http.base.internal.whiteboard.tracker.JavaxFilterTracker;
import org.apache.felix.http.base.internal.whiteboard.tracker.JavaxListenersTracker;
import org.apache.felix.http.base.internal.whiteboard.tracker.JavaxPreprocessorTracker;
import org.apache.felix.http.base.internal.whiteboard.tracker.JavaxServletContextHelperTracker;
import org.apache.felix.http.base.internal.whiteboard.tracker.JavaxServletTracker;
+import org.apache.felix.http.base.internal.whiteboard.tracker.ListenersTracker;
+import org.apache.felix.http.base.internal.whiteboard.tracker.PreprocessorTracker;
import org.apache.felix.http.base.internal.whiteboard.tracker.ResourceTracker;
import org.apache.felix.http.base.internal.whiteboard.tracker.ServletContextHelperTracker;
+import org.apache.felix.http.base.internal.whiteboard.tracker.ServletTracker;
import org.jetbrains.annotations.NotNull;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -75,13 +79,13 @@ import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
+import org.osgi.service.servlet.whiteboard.Preprocessor;
+import org.osgi.service.servlet.whiteboard.ServletContextHelper;
import org.osgi.service.servlet.whiteboard.runtime.HttpServiceRuntimeConstants;
import org.osgi.service.servlet.whiteboard.runtime.dto.DTOConstants;
import org.osgi.service.servlet.whiteboard.runtime.dto.PreprocessorDTO;
import org.osgi.service.servlet.whiteboard.runtime.dto.ServletContextDTO;
-import org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
-import org.osgi.service.servlet.whiteboard.Preprocessor;
-import org.osgi.service.servlet.whiteboard.ServletContextHelper;
import org.osgi.util.tracker.ServiceTracker;
import jakarta.servlet.FilterChain;
@@ -227,10 +231,10 @@ public final class WhiteboardManager
// nothing to do
}
}, props);
-// addTracker(new FilterTracker(this.httpBundleContext, this));
-// addTracker(new ListenersTracker(this.httpBundleContext, this));
-// addTracker(new PreprocessorTracker(this.httpBundleContext, this));
-// addTracker(new ServletTracker(this.httpBundleContext, this));
+ addTracker(new FilterTracker(this.httpBundleContext, this));
+ addTracker(new ListenersTracker(this.httpBundleContext, this));
+ addTracker(new PreprocessorTracker(this.httpBundleContext, this));
+ addTracker(new ServletTracker(this.httpBundleContext, this));
addTracker(new ResourceTracker(this.httpBundleContext, this));
addTracker(new ServletContextHelperTracker(this.httpBundleContext, this));
addTracker(new JavaxServletContextHelperTracker(httpBundleContext, this));
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index d271130..06d86a6 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -199,6 +199,8 @@
<Provide-Capability>
osgi.implementation;osgi.implementation="osgi.http";version:Version="1.1";
uses:="javax.servlet,javax.servlet.http,org.osgi.service.http.context,org.osgi.service.http.whiteboard",
+ osgi.service;objectClass:List<String>="org.osgi.service.servlet.whiteboard.runtime.HttpServiceRuntime";
+ uses:="org.osgi.service.servlet.whiteboard.runtime,org.osgi.service.servlet.whiteboard.runtime.dto",
osgi.service;objectClass:List<String>="org.osgi.service.http.runtime.HttpServiceRuntime";
uses:="org.osgi.service.http.runtime,org.osgi.service.http.runtime.dto",
osgi.service;objectClass:List<String>="org.osgi.service.http.HttpService";
@@ -267,6 +269,8 @@
<Provide-Capability>
osgi.implementation;osgi.implementation="osgi.http";version:Version="1.1";
uses:="javax.servlet,javax.servlet.http,org.osgi.service.http.context,org.osgi.service.http.whiteboard",
+ osgi.service;objectClass:List<String>="org.osgi.service.servlet.whiteboard.runtime.HttpServiceRuntime";
+ uses:="org.osgi.service.servlet.whiteboard.runtime,org.osgi.service.servlet.whiteboard.runtime.dto",
osgi.service;objectClass:List<String>="org.osgi.service.http.runtime.HttpServiceRuntime";
uses:="org.osgi.service.http.runtime,org.osgi.service.http.runtime.dto",
osgi.service;objectClass:List<String>="org.osgi.service.http.HttpService";