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:31 UTC

[felix-dev] 18/19: Update implementation to use jakarta packages

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 309dd7bc8930404f1c2d3933f5888995033bd3ec
Author: Carsten Ziegeler <cz...@adobe.com>
AuthorDate: Mon Jan 3 11:18:18 2022 +0100

    Update implementation to use jakarta packages
---
 .../internal/dispatch/ServletRequestWrapper.java   |  2 +-
 .../internal/javaxwrappers/FilterChainWrapper.java |  4 --
 .../base/internal/service/ServletContextImpl.java  | 82 ----------------------
 3 files changed, 1 insertion(+), 87 deletions(-)

diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java
index d2456e6..3b006e5 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java
@@ -74,7 +74,7 @@ final class ServletRequestWrapper extends HttpServletRequestWrapper
             FORWARD_MAPPING, FORWARD_PATH_INFO, FORWARD_QUERY_STRING, FORWARD_REQUEST_URI, FORWARD_SERVLET_PATH,
             INCLUDE_CONTEXT_PATH, INCLUDE_MAPPING, INCLUDE_PATH_INFO, INCLUDE_QUERY_STRING, INCLUDE_REQUEST_URI,
             INCLUDE_SERVLET_PATH);
-    
+
     /**
      * Constant for HTTP POST method.
      */
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/FilterChainWrapper.java b/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/FilterChainWrapper.java
index 882e6c1..6d7d5d0 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/FilterChainWrapper.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/FilterChainWrapper.java
@@ -18,10 +18,6 @@ package org.apache.felix.http.base.internal.javaxwrappers;
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
 import org.apache.felix.http.base.internal.jakartawrappers.ServletResponseWrapper;
 import org.jetbrains.annotations.NotNull;
 
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 b2b88ef..c472feb 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
@@ -610,88 +610,6 @@ public class ServletContextImpl implements ExtServletContext
     }
 
     @Override
-    public Dynamic addJspFile(final String servletName, final String jspFile) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getSessionTimeout() {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public void setSessionTimeout(final int sessionTimeout) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public String getRequestCharacterEncoding() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void setRequestCharacterEncoding(final String encoding) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public String getResponseCharacterEncoding() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void setResponseCharacterEncoding(final String encoding) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public Dynamic addJspFile(final String servletName, final String jspFile) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getSessionTimeout() {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public void setSessionTimeout(final int sessionTimeout) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public String getRequestCharacterEncoding() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void setRequestCharacterEncoding(final String encoding) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public String getResponseCharacterEncoding() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void setResponseCharacterEncoding(final String encoding) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
     public HttpConfig getConfig()
     {
         return this.handlerRegistry.getConfig();