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 e3493cfd2c44a1b58f1c9c6b83e9ce929057f7d1 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 | 1 + .../base/internal/service/ServletContextImpl.java | 41 ++++++++++++++++++++++ http/jetty/pom.xml | 16 +++++++++ 3 files changed, 58 insertions(+) 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 18b320d..62bc418 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 @@ -71,6 +71,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/service/ServletContextImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java index ecec5e2..a52bf1e 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 @@ -650,6 +650,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 bf4b721..d80fa50 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> @@ -357,6 +358,21 @@ <version>${jetty.version}</version> </dependency> <dependency> +<<<<<<< HEAD +======= + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-servlet</artifactId> + <version>${jetty.version}</version> + </dependency> +<!-- + <dependency> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-server</artifactId> + <version>${jetty.version}</version> + </dependency> +--> + <dependency> +>>>>>>> 8dc97db602 (Update jetty to Jetty 11, jakarta servlet api) <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-server</artifactId> <version>${jetty.version}</version>
