This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a change to branch http/jakarta
in repository https://gitbox.apache.org/repos/asf/felix-dev.git.
from 58a3146 FELIX-6492 : Remove usage of deprecated Jetty api
add 814f33b Remove usage of deprecated test utility methods
add 2f4a002 Remove unused code/classes and adjust tests
new 462203d Update jetty to Jetty 11, jakarta servlet api
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
http/base/pom.xml | 13 +-
.../felix/http/base/internal/EventDispatcher.java | 6 +-
.../http/base/internal/HttpServiceController.java | 32 +-
.../base/internal/console/HttpServicePlugin.java | 10 +-
.../base/internal/context/ExtServletContext.java | 19 +-
.../internal/context/ExtServletContextWrapper.java | 40 +-
.../http/base/internal/dispatch/Dispatcher.java | 30 +-
.../base/internal/dispatch/DispatcherServlet.java | 8 +-
.../base/internal/dispatch/InvocationChain.java | 16 +-
.../internal/dispatch/RequestDispatcherImpl.java | 14 +-
.../internal/dispatch/ServletRequestWrapper.java | 100 +++--
.../internal/dispatch/ServletResponseWrapper.java | 14 +-
.../base/internal/handler/FilterConfigImpl.java | 4 +-
.../http/base/internal/handler/FilterHandler.java | 73 ++--
.../handler/HttpServiceServletHandler.java | 22 +-
.../base/internal/handler/HttpSessionWrapper.java | 12 +-
.../base/internal/handler/ListenerHandler.java | 70 ++--
.../base/internal/handler/PreprocessorHandler.java | 25 +-
.../base/internal/handler/ServletConfigImpl.java | 4 +-
.../http/base/internal/handler/ServletHandler.java | 23 +-
.../internal/handler/WhiteboardFilterHandler.java | 80 ----
.../handler/WhiteboardListenerHandler.java | 80 ----
.../internal/handler/WhiteboardServletHandler.java | 14 +-
.../jakartawrappers/AsyncContextWrapper.java | 109 ++++++
.../jakartawrappers/AsyncListenerWrapper.java | 76 ++++
.../internal/jakartawrappers/CookieWrapper.java | 111 ++++++
.../jakartawrappers/EventListenerWrapper.java | 229 +++++++++++
.../jakartawrappers/FilterRegistrationWrapper.java | 115 ++++++
.../internal/jakartawrappers/FilterWrapper.java | 78 ++++
.../jakartawrappers/HttpServletRequestWrapper.java | 241 ++++++++++++
.../HttpServletResponseWrapper.java | 151 ++++++++
.../jakartawrappers/HttpSessionContextWrapper.java | 55 +++
.../jakartawrappers/HttpSessionWrapper.java | 132 +++++++
.../base/internal/jakartawrappers/PartWrapper.java | 91 +++++
.../PreprocessorWrapper.java} | 37 +-
.../ReadListenerWrapper.java} | 60 +--
.../jakartawrappers/RequestDispatcherWrapper.java | 62 +++
.../jakartawrappers/ServletConfigWrapper.java | 60 +++
.../ServletContextHelperWrapper.java | 85 +++++
.../jakartawrappers/ServletContextWrapper.java | 417 +++++++++++++++++++++
.../jakartawrappers/ServletExceptionUtil.java | 50 +++
.../jakartawrappers/ServletInputStreamWrapper.java | 128 +++++++
.../ServletOutputStreamWrapper.java | 150 ++++++++
.../ServletRegistrationWrapper.java | 86 +++++
.../jakartawrappers/ServletRequestWrapper.java | 339 +++++++++++++++++
.../jakartawrappers/ServletResponseWrapper.java | 145 +++++++
.../internal/jakartawrappers/ServletWrapper.java | 98 +++++
.../SessionCookieConfigWrapper.java | 107 ++++++
.../WriteListenerWrapper.java} | 40 +-
.../javaxwrappers/AsyncContextWrapper.java | 104 +++++
.../javaxwrappers/AsyncListenerWrapper.java | 78 ++++
.../base/internal/javaxwrappers/CookieWrapper.java | 111 ++++++
.../internal/javaxwrappers/FilterChainWrapper.java | 54 +++
.../javaxwrappers/FilterConfigWrapper.java | 59 +++
.../javaxwrappers/FilterRegistrationWrapper.java | 115 ++++++
.../javaxwrappers/HttpServletRequestWrapper.java | 238 ++++++++++++
.../javaxwrappers/HttpServletResponseWrapper.java | 151 ++++++++
.../javaxwrappers/HttpSessionContextWrapper.java | 55 +++
.../internal/javaxwrappers/HttpSessionWrapper.java | 130 +++++++
.../base/internal/javaxwrappers/PartWrapper.java | 91 +++++
.../ReadListenerWrapper.java} | 60 +--
.../javaxwrappers/RequestDispatcherWrapper.java | 61 +++
.../javaxwrappers/ServletConfigWrapper.java | 59 +++
.../javaxwrappers/ServletContextWrapper.java | 416 ++++++++++++++++++++
.../javaxwrappers/ServletExceptionUtil.java | 50 +++
.../javaxwrappers/ServletInputStreamWrapper.java | 128 +++++++
.../javaxwrappers/ServletOutputStreamWrapper.java | 150 ++++++++
.../javaxwrappers/ServletRegistrationWrapper.java | 86 +++++
.../javaxwrappers/ServletRequestWrapper.java | 334 +++++++++++++++++
.../javaxwrappers/ServletResponseWrapper.java | 145 +++++++
.../internal/javaxwrappers/ServletWrapper.java | 83 ++++
.../javaxwrappers/SessionCookieConfigWrapper.java | 107 ++++++
.../WriteListenerWrapper.java} | 40 +-
.../internal/registry/EventListenerRegistry.java | 28 +-
.../base/internal/registry/FilterRegistry.java | 2 +-
.../base/internal/registry/HandlerRegistry.java | 2 +-
.../registry/PerContextHandlerRegistry.java | 2 +-
.../http/base/internal/runtime/AbstractInfo.java | 27 ++
.../http/base/internal/runtime/FilterInfo.java | 50 +--
.../http/base/internal/runtime/ListenerInfo.java | 83 ++--
.../base/internal/runtime/PreprocessorInfo.java | 24 +-
.../http/base/internal/runtime/ResourceInfo.java | 8 +-
.../internal/runtime/ServletContextHelperInfo.java | 18 +-
.../http/base/internal/runtime/ServletInfo.java | 23 +-
.../internal/runtime/dto/FilterDTOBuilder.java | 2 +-
.../internal/runtime/dto/ListenerDTOBuilder.java | 2 +-
.../runtime/dto/RequestInfoDTOBuilder.java | 2 +-
.../runtime/dto/ServletContextDTOBuilder.java | 2 +-
.../base/internal/service/DefaultHttpContext.java | 13 +-
...ltHttpContext.java => HttpResourceServlet.java} | 35 +-
.../base/internal/service/HttpServiceFactory.java | 12 +-
.../internal/service/PerBundleHttpServiceImpl.java | 49 ++-
.../base/internal/service/ServletContextImpl.java | 91 ++++-
.../internal/service/ServletContextManager.java | 2 +-
.../internal/service/SharedHttpServiceImpl.java | 60 ++-
.../internal/whiteboard/FailureStateHandler.java | 2 +-
.../whiteboard/HttpServiceContextHandler.java | 2 +-
.../whiteboard/PerBundleServletContextImpl.java | 88 +++--
.../whiteboard/RegistrationFailureException.java | 2 +-
.../{service => whiteboard}/ResourceServlet.java | 91 ++---
.../whiteboard/SharedServletContextImpl.java | 72 +++-
.../whiteboard/WhiteboardContextHandler.java | 12 +-
.../internal/whiteboard/WhiteboardManager.java | 61 +--
.../internal/whiteboard/tracker/FilterTracker.java | 4 +-
.../whiteboard/tracker/JavaxFilterTracker.java | 88 +++++
.../whiteboard/tracker/JavaxListenersTracker.java | 169 +++++++++
.../tracker/JavaxPreprocessorTracker.java | 82 ++++
....java => JavaxServletContextHelperTracker.java} | 64 +++-
.../whiteboard/tracker/JavaxServletTracker.java | 88 +++++
.../whiteboard/tracker/ListenersTracker.java | 16 +-
.../whiteboard/tracker/PreprocessorTracker.java | 6 +-
.../tracker/ServletContextHelperTracker.java | 5 +-
.../whiteboard/tracker/ServletTracker.java | 4 +-
.../whiteboard/Preprocessor.java} | 24 +-
.../base/osgi/whiteboard/ServletContextHelper.java | 97 +++++
.../internal/context/ServletContextImplTest.java | 87 ++++-
.../context/ServletContextManagerTest.java | 2 +-
.../internal/handler/FilterConfigImplTest.java | 2 +-
.../base/internal/handler/FilterHandlerTest.java | 54 +--
.../handler/HttpServiceServletHandlerTest.java | 20 +-
.../internal/handler/HttpSessionWrapperTest.java | 4 +-
.../internal/handler/ServletConfigImplTest.java | 2 +-
.../internal/registry/ErrorPageRegistryTest.java | 10 +-
.../registry/EventListenerRegistryTest.java | 116 +++---
.../base/internal/registry/FilterRegistryTest.java | 125 +++---
.../internal/registry/HandlerRegistryTest.java | 12 +-
.../internal/registry/ServletRegistryTest.java | 10 +-
.../internal/runtime/AbstractInfoOrderingTest.java | 6 +
.../base/internal/runtime/ListenerInfoTest.java | 2 +-
.../internal/service/HttpServiceFactoryTest.java | 2 +-
http/itest/pom.xml | 4 +-
.../felix/http/itest/BaseIntegrationTest.java | 2 +
http/jetty/pom.xml | 26 +-
.../felix/http/jetty/internal/JettyService.java | 8 +-
.../jetty/internal/webapp/WebAppBundleTracker.java | 4 +-
.../org/apache/felix/http/jetty/package-info.java | 4 +-
.../http/jetty/internal/JettyServiceTest.java | 48 ++-
.../http/jetty/internal/RequestLogTrackerTest.java | 31 +-
138 files changed, 7872 insertions(+), 1089 deletions(-)
delete mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/handler/WhiteboardFilterHandler.java
delete mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/handler/WhiteboardListenerHandler.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/AsyncContextWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/AsyncListenerWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/CookieWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/EventListenerWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/FilterRegistrationWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/FilterWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/HttpServletRequestWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/HttpServletResponseWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/HttpSessionContextWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/HttpSessionWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/PartWrapper.java
copy
http/base/src/main/java/org/apache/felix/http/base/internal/{handler/HttpServiceFilterHandler.java
=> jakartawrappers/PreprocessorWrapper.java} (53%)
copy
http/base/src/main/java/org/apache/felix/http/base/internal/{service/DefaultHttpContext.java
=> jakartawrappers/ReadListenerWrapper.java} (51%)
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/RequestDispatcherWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletConfigWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletContextHelperWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletContextWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletExceptionUtil.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletInputStreamWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletOutputStreamWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletRegistrationWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletRequestWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletResponseWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/ServletWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/SessionCookieConfigWrapper.java
copy
http/base/src/main/java/org/apache/felix/http/base/internal/{handler/HttpServiceFilterHandler.java
=> jakartawrappers/WriteListenerWrapper.java} (53%)
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/AsyncContextWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/AsyncListenerWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/CookieWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/FilterChainWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/FilterConfigWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/FilterRegistrationWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/HttpServletRequestWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/HttpServletResponseWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/HttpSessionContextWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/HttpSessionWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/PartWrapper.java
copy
http/base/src/main/java/org/apache/felix/http/base/internal/{service/DefaultHttpContext.java
=> javaxwrappers/ReadListenerWrapper.java} (51%)
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/RequestDispatcherWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/ServletConfigWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/ServletContextWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/ServletExceptionUtil.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/ServletInputStreamWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/ServletOutputStreamWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/ServletRegistrationWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/ServletRequestWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/ServletResponseWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/ServletWrapper.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/SessionCookieConfigWrapper.java
copy
http/base/src/main/java/org/apache/felix/http/base/internal/{handler/HttpServiceFilterHandler.java
=> javaxwrappers/WriteListenerWrapper.java} (54%)
copy
http/base/src/main/java/org/apache/felix/http/base/internal/service/{DefaultHttpContext.java
=> HttpResourceServlet.java} (54%)
rename http/base/src/main/java/org/apache/felix/http/base/internal/{service =>
whiteboard}/ResourceServlet.java (77%)
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/JavaxFilterTracker.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/JavaxListenersTracker.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/JavaxPreprocessorTracker.java
copy
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/{ServletContextHelperTracker.java
=> JavaxServletContextHelperTracker.java} (58%)
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/JavaxServletTracker.java
rename
http/base/src/main/java/org/apache/felix/http/base/{internal/handler/HttpServiceFilterHandler.java
=> osgi/whiteboard/Preprocessor.java} (53%)
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/osgi/whiteboard/ServletContextHelper.java
