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 10:07:21 UTC
[felix-dev] 08/19: Update mapping to jakarta.servlet
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 295be76533743cedd426cf5ef9382f295180c035
Author: Carsten Ziegeler <cz...@adobe.com>
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 109defb..73f7f64 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 7e74c04..672c5f2 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