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 8f2b2b429f27890a48aa6337439a5a41dc0b0f05 Author: Carsten Ziegeler <[email protected]> AuthorDate: Sun Jan 2 14:54:35 2022 +0100 Update jetty to Jetty 11, jakarta servlet api --- .../internal/dispatch/ServletRequestWrapper.java | 4 +++ .../jakartawrappers/ServletExceptionUtil.java | 1 + .../jakartawrappers/ServletRequestWrapper.java | 2 -- .../internal/javaxwrappers/FilterChainWrapper.java | 4 +++ .../javaxwrappers/ServletExceptionUtil.java | 1 + .../base/internal/service/ServletContextImpl.java | 41 ++++++++++++++++++++++ http/jetty/pom.xml | 1 + 7 files changed, 52 insertions(+), 2 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 493ce08..6e687e5 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,6 +74,10 @@ 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. + */ + private static final String POST_METHOD = "POST"; /** * Constant for HTTP POST method. diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletExceptionUtil.java b/http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletExceptionUtil.java index b55a604..2b31b0a 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletExceptionUtil.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletExceptionUtil.java @@ -19,6 +19,7 @@ package org.apache.felix.http.base.internal.jakartawrappers; import org.jetbrains.annotations.NotNull; import jakarta.servlet.ServletException; +import jakarta.servlet.UnavailableException; /** * Helper class to wrap servlet exceptions diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletRequestWrapper.java b/http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletRequestWrapper.java index 0d42f91..e743fb6 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletRequestWrapper.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletRequestWrapper.java @@ -29,13 +29,11 @@ import static jakarta.servlet.RequestDispatcher.ERROR_REQUEST_URI; import static jakarta.servlet.RequestDispatcher.ERROR_SERVLET_NAME; import static jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE; import static jakarta.servlet.RequestDispatcher.FORWARD_CONTEXT_PATH; -import static jakarta.servlet.RequestDispatcher.FORWARD_MAPPING; import static jakarta.servlet.RequestDispatcher.FORWARD_PATH_INFO; import static jakarta.servlet.RequestDispatcher.FORWARD_QUERY_STRING; import static jakarta.servlet.RequestDispatcher.FORWARD_REQUEST_URI; import static jakarta.servlet.RequestDispatcher.FORWARD_SERVLET_PATH; import static jakarta.servlet.RequestDispatcher.INCLUDE_CONTEXT_PATH; -import static jakarta.servlet.RequestDispatcher.INCLUDE_MAPPING; import static jakarta.servlet.RequestDispatcher.INCLUDE_PATH_INFO; import static jakarta.servlet.RequestDispatcher.INCLUDE_QUERY_STRING; import static jakarta.servlet.RequestDispatcher.INCLUDE_REQUEST_URI; 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 6d7d5d0..882e6c1 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,6 +18,10 @@ 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/javaxwrappers/ServletExceptionUtil.java b/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/ServletExceptionUtil.java index ad7ecb7..8eddbf0 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/ServletExceptionUtil.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/ServletExceptionUtil.java @@ -19,6 +19,7 @@ package org.apache.felix.http.base.internal.javaxwrappers; import org.jetbrains.annotations.NotNull; import jakarta.servlet.ServletException; +import jakarta.servlet.UnavailableException; /** * Helper class to wrap servlet exceptions 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 c472feb..e2d6519 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,6 +610,47 @@ 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 HttpConfig getConfig() { return this.handlerRegistry.getConfig(); diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 9bd51d6..f480062 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -160,6 +160,7 @@ org.osgi.service.http.whiteboard, !org.eclipse.jetty, !org.eclipse.jetty.version, + !org.eclipse.jetty.websocket.core.server.internal, org.eclipse.jetty.*, org.apache.felix.http.jetty </Export-Package>
