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
commit fb961d80a067fff4ea87c7eeaae0ab2540d0451e Author: Carsten Ziegeler <[email protected]> AuthorDate: Mon Jan 3 15:27:09 2022 +0100 Update mapping to jakarta.servlet --- .../org/apache/felix/http/base/internal/registry/PathResolution.java | 2 +- .../apache/felix/http/base/internal/registry/PathResolverFactory.java | 4 ++-- .../apache/felix/http/base/internal/service/ServletContextImpl.java | 1 + .../felix/http/base/internal/whiteboard/SharedServletContextImpl.java | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolution.java b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolution.java index 3b210cd..945be63 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolution.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolution.java @@ -16,7 +16,7 @@ */ package org.apache.felix.http.base.internal.registry; -import javax.servlet.http.MappingMatch; +import jakarta.servlet.http.MappingMatch; /** * Resolution of a servlet based on the path diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolverFactory.java b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolverFactory.java index d870f08..147b782 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolverFactory.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolverFactory.java @@ -18,13 +18,13 @@ package org.apache.felix.http.base.internal.registry; import java.util.regex.Pattern; -import javax.servlet.http.MappingMatch; - import org.apache.felix.http.base.internal.handler.ServletHandler; import org.apache.felix.http.base.internal.service.HttpServiceFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import jakarta.servlet.http.MappingMatch; + /** * The path resolver factory creates a path resolver for a pattern. * The servlet spec supports different patterns diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java index 6109af4..ddce320 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java @@ -64,6 +64,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSessionAttributeListener; import jakarta.servlet.http.HttpSessionListener; +import jakarta.servlet.http.MappingMatch; @SuppressWarnings("deprecation") public class ServletContextImpl implements ExtServletContext diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java index d8a0a15..7b86235 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java @@ -51,6 +51,7 @@ import jakarta.servlet.ServletRegistration.Dynamic; import jakarta.servlet.SessionCookieConfig; import jakarta.servlet.SessionTrackingMode; import jakarta.servlet.descriptor.JspConfigDescriptor; +import jakarta.servlet.http.MappingMatch; /** * This servlet context implementation represents the shared
