This is an automated email from the ASF dual-hosted git repository.
paulrutter pushed a change to branch feature/FELIX-6750-Jetty-12.1.0-tryout
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
from eb61dc7817 FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP - Update
wrappers to implement new methods for servlet-api 6.1. This will break
backwards compatbility though
add f23094ca7d FELIX-6746 JettyWebSocketServlet: Error during calling
init() - Add reproducer in integration test
add 0de03ea42d FELIX-6746 JettyWebSocketServlet: Error during calling
init() - Call init lazy in case of servlets that extend JettyWebSocketServlet -
This fixes the IT as well
add 1a94da05a2 FELIX-6746 JettyWebSocketServlet: Error during calling
init() - Extract test methods - Remove ServletWrapper support, as it doesn't
work properly yet
add 6044d22b63 FELIX-6746 JettyWebSocketServlet: Error during calling
init() - Make solution thread-safe - Fix destroy logic - Minor test improvements
add 93f2d2045b FELIX-6746 JettyWebSocketServlet: Error during calling
init() - Add support for HttpService / ServletWrappers - Add IT to guard it
add bb22e52046 FELIX-6746 JettyWebSocketServlet: Error during calling
init() - Update whiteboard examples; the FelixJettyWebSocketServlet is no
longer needed with these fixes
add 37254fd6a4 FELIX-6746 JettyWebSocketServlet: Error during calling
init() - Disable HTTP service test, as it fails with
"java.lang.IllegalStateException: JettyServerFrameHandlerFactory not found"
add 95e594c024 FELIX-6746 JettyWebSocketServlet: Error during calling
init() - Fix passing along shared websocket attributes to the HttpContext in
SharedHttpServiceImpl, when registerServlet is called - Enable test again
add 24edc751a3 FELIX-6746 JettyWebSocketServlet: Error during calling
init() - Add NPE check
add 7f70602653 Merge branch 'master' into
maintenance/FELIX-6746-websocketservlet-init-NPE
add 5a21ef7953 Merge branch 'master' into
maintenance/FELIX-6746-websocketservlet-init-NPE
add a05cdb0b87 Update README.md
add 3c33138131 Merge branch 'master' into
maintenance/FELIX-6746-websocketservlet-init-NPE
add 3be9609df2 Merge branch 'master' into
maintenance/FELIX-6746-websocketservlet-init-NPE
add ce69d42865 Merge branch 'master' into
maintenance/FELIX-6746-websocketservlet-init-NPE
add bb16933c80 FELIX-6746-websocketservlet-init-NPE - Move logic into
subclass
add 1035eade8b Merge branch
'maintenance/FELIX-6746-websocketservlet-init-NPE-subclass' into
maintenance/FELIX-6746-websocketservlet-init-NPE
add 7e5f719b34 FELIX-6746-websocketservlet-init-NPE - Imports
add c849ca47be FELIX-6746-websocketservlet-init-NPE - Minor changes
add 7612655dd7 FELIX-6746-websocketservlet-init-NPE - Remove util class,
move method to handler - Add unit test, add test scope dependency on jetty12
add 0b538230a5 Merge pull request #364 from
apache/maintenance/FELIX-6746-websocketservlet-init-NPE
add e921130416 Merge branch 'master' into
feature/FELIX-6750-Jetty-12.1.0-tryout
No new revisions were added by this update.
Summary of changes:
http/README.md | 1 +
http/base/pom.xml | 6 ++
.../http/base/internal/HttpServiceController.java | 1 +
.../handler/HttpServiceServletHandler.java | 2 +-
.../HttpServiceWebSocketServletHandler.java | 65 ++++++++++++
.../http/base/internal/handler/ServletHandler.java | 3 +-
.../base/internal/handler/WebSocketHandler.java | 115 +++++++++++++++++++++
.../internal/handler/WhiteboardServletHandler.java | 2 +-
.../handler/WhiteboardWebSocketServletHandler.java | 76 ++++++++++++++
.../base/internal/service/HttpServiceFactory.java | 12 +++
.../internal/service/SharedHttpServiceImpl.java | 42 +++++++-
.../internal/whiteboard/WhiteboardManager.java | 40 +++++--
.../internal/handler/WebSocketHandlerTest.java | 52 ++++++++++
.../http/jetty/it/JettySpecificWebsocketIT.java | 47 ++++++++-
.../whiteboard/FelixJettyWebSocketServlet.java | 72 -------------
.../TestWebSocketServletAlternative.java | 4 +-
16 files changed, 448 insertions(+), 92 deletions(-)
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpServiceWebSocketServletHandler.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/handler/WebSocketHandler.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/handler/WhiteboardWebSocketServletHandler.java
create mode 100644
http/base/src/test/java/org/apache/felix/http/base/internal/handler/WebSocketHandlerTest.java
delete mode 100644
http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/FelixJettyWebSocketServlet.java
