Commit Graph

3895 Commits

Author SHA1 Message Date
Lachlan Roberts bd396f867b Fix some more unstable tests.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-19 20:43:13 +10:00
Lachlan Roberts 026261f482 Issue #6566 - use counter in BufferCallbackAccumulator, fix InputStreamMessageSinkTest failures
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-18 17:10:12 +10:00
Lachlan Roberts 65ff0bb081 Fix broken test in OutgoingMessageCapture.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-18 13:15:16 +10:00
Lachlan Roberts 5236e47c42 Issue #6566 - utilise the demand interface in the websocket MessageSinks
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-18 11:04:14 +10:00
Lachlan Roberts d3dfe353be Expose the isInputOpen() method in CoreSession interface.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-18 11:00:39 +10:00
Lachlan Roberts 646707b85c Issue #6602 - do not invoke SessionListener onOpen if session has been closed in OnOpen
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-12 15:50:25 +10:00
Lachlan Roberts edec52893b Add name on WebSocketComponents default threadpool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-04 16:49:15 +10:00
Lachlan Roberts 316c46675e Fix WebSocketComponents LifeCycle in AbstractJavaxWebSocketFrameHandlerTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-04 16:19:34 +10:00
Lachlan Roberts de8cbcf588 Fix broken tests using WebSocketComponents
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-04 15:11:35 +10:00
Lachlan Roberts 14c09e3c98 Issue #6566 - fix WebSocketComponents LifeCycle issue
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-04 13:28:10 +10:00
Lachlan Roberts bbabaee8cc Issue #6566 - add executor to WebSocketComponents & use for Dispatched Messages
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-04 11:24:10 +10:00
Ludovic Orban c9a5d8df58 #6322 Use RetainableByteBuffer and write a new pool for it
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-07-24 11:14:21 +02:00
Joakim Erdfelt c245a70893 Updating to version 10.0.7-SNAPSHOT 2021-06-29 10:51:22 -05:00
Joakim Erdfelt 37e7731b4b Updating to version 10.0.6 2021-06-29 10:27:56 -05:00
Lachlan 1cd0093855
Merge pull request #6411 from eclipse/jetty-10.0.x-6407-ClientUpgradeRequestUri
Issue #6407 - Fix URI validation for WebSocket ClientUpgradeRequest
2021-06-23 10:37:58 +10:00
Jan Bartel 2c2781a73e
Jetty 10.0.x 6423 service provider osgi headers (#6424)
* Issue #6423 Add headers to jetty manifests to expose o.e.j.w.Configuration for osgi ServiceLoader.

 Add jetty-annotations manifest to expose o.e.j.w.Configuration  to ServiceLoader. 
 Add osgi headers to jetty-quickstart for o.e.j.w.Configuration
 Add osgi serviceloader headers for jetty-cdi
 Add osgi serviceloader headers to websocket-jetty-client
 Add osgi serviceloader headers to jetty-ant
  Add osgi serviceloader headers to websocket-javax-client
 Add osgi serviceloader headers for websocket-jetty-common
 Add osgi serviceloader headers for websocket-core-common

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-23 08:32:21 +10:00
Simone Bordet b8d6e3f010
Fixes #6410 - Use SocketAddress instead of InetSocketAddress. (#6414)
* Fixes #6410 - Use SocketAddress instead of InetSocketAddress.

Removed usages of InetSocketAddress in method signatures where possible.
Deprecated old methods, and added new methods with SocketAddress.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-17 10:18:08 +02:00
Lachlan Roberts 402d79f59a fix javadoc for ClientUpgradeRequest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-16 01:00:45 +10:00
Lachlan Roberts 10ed23f22d add javadoc and null check for HttpScheme
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-16 00:40:35 +10:00
Lachlan Roberts 148cf38c5d Issue #6407 - fix logic in ClientUpgradeRequest(URI) constructor and deprecate it
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-15 18:47:20 +10:00
Joakim Erdfelt 9d2d1e29b7 Updating to version 10.0.6-SNAPSHOT 2021-06-11 09:42:42 -05:00
Joakim Erdfelt dc21b2d73c Updating to version 10.0.5 2021-06-11 09:18:00 -05:00
Lachlan 6dea0251c2
Issue #4772 - support partial messages for Jetty WS API annotations (#6357)
* Issue #4772 - support partial messages for Jetty WS API annotations

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-10 16:05:54 +02:00
Joakim Erdfelt 987066aac1 Updating to version 10.0.5-SNAPSHOT 2021-06-04 13:28:47 -05:00
Joakim Erdfelt 5523480c54 Updating to version 10.0.4 2021-06-04 13:09:44 -05:00
Simone Bordet 9ace21992e Updated POM versions to 10.0.4-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-21 17:07:46 +02:00
Lachlan cd73338b84
Remove WebSocketComponents & HouseKeeper on Server restart. (#6218)
* Remove WebSocketComponents & HouseKeeper on Server restart.
* Add testing for cleanup of websocket when stopping server.
* Add removeFilterHolder and removeFilterMapping methods on ServletHandler.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-20 14:48:23 +02:00
Lachlan Roberts 0761aee75a Disable websocketProvidedByWebApp on JDK14-15 due to JDK-8244090 bug.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-20 01:17:42 +10:00
Lachlan Roberts 779cf4ccbc Issue #6287 - improve testing & changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-19 11:24:15 +10:00
Lachlan Roberts d7c42bb49a Issue #6287 - fix classloading for WebSocketClient in webapp
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-18 17:51:26 +10:00
Lachlan f828411c16
Merge pull request #6119 from eclipse/jetty-10.0.x-6106-WebSocketCDI
Issue #6106 - Fix WebSocket/CDI integration in Jetty 10
2021-04-30 14:21:14 +10:00
Simone Bordet 8b10f3ebd5 Documented WebSocketClient.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-27 11:04:42 +02:00
Lachlan Roberts a0cca858a7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-6106-WebSocketCDI 2021-04-27 16:15:52 +10:00
Lachlan Roberts ce8ede5c71 Use correct logger in AvailableEncoders.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-27 10:38:42 +10:00
Lachlan Roberts 5b13006a59 Make AvailableEncoders & AvailableDecoders implement Closable.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-21 21:46:28 +10:00
Lachlan Roberts ab08d1a1c6 Ensure that javax.websocket Encoder/Decoder destroy method is called.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-20 11:11:05 +10:00
Lachlan dab26c601d
Merge pull request #6170 from eclipse/jetty-10.0.x-6166-MessageInputStream
Issue #6166 - fix bug in the MessageInputStream byte array read
2021-04-15 20:16:06 +10:00
Lachlan Roberts 045bc72c92 Disable test for WebSocket CDI HttpSession injection and link to issue.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-15 09:40:11 +10:00
Lachlan Roberts afa2b71f4f Re-enable disabled tests for the WebSocket SessionTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-14 15:22:56 +10:00
Lachlan Roberts bd79187194 Issue #6166 - fix bug in the MessageInputStream byte array read
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-14 10:41:35 +10:00
Lachlan Roberts 1cb10b8548 Remove unnecessary comment.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-08 09:28:28 +10:00
Lachlan Roberts f91334e6d7 Fix two disabled tests in TextStreamTest.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-07 20:54:43 +10:00
Lachlan Roberts 0d84f35b0d Issue #6106 - Decorate javax.websocket components during the websocket upgrade.
Decoration should not be delayed until onOpen it should be during the call to
the WebSocketUpgradeFilter or WebSocketServlet.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-07 16:43:10 +10:00
Lachlan Roberts 02ef27246c Fix broken websocket tests.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-06 23:18:41 +10:00
Lachlan Roberts f858aa653c Issue #6106 - always decorate javax.websocket Configurators
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-06 22:39:15 +10:00
Lachlan Roberts a1e522755b Issue #6106 - Decorate javax.websocket Encoder & Decoders.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-06 16:09:15 +10:00
Lachlan Roberts ac5eb54e1e Issue #6106 - fix WebSocket/CDI integration
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-31 18:49:31 +11:00
Lachlan 8a10cd1615
Merge pull request #6094 from eclipse/jetty-10.0.x-WebSocketServerComponents
Do not store WebSocketComponents in Server scope.
2021-03-31 10:55:36 +11:00
Lachlan Roberts 16b014c2fb Unmanage beans on WSSComponents if they are also beans on server.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-30 17:50:55 +11:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
Olivier Lamy 7bd207b309 Updating to version 10.0.2 2021-03-26 06:13:42 +00:00
Olivier Lamy d27363fa55 back to 10.0.2-SNAPSHOT
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-03-26 06:10:47 +00:00
Lachlan Roberts 47ec9b1a7e Modify SecureClientContainerExample to use the new getContainer(HttpClient) method.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-26 14:55:32 +11:00
Lachlan Roberts 57779c6026 Make the HttpClient getContainer method static on JavaxWebSocketClientContainerProvider.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-26 11:11:18 +11:00
Jesse McConnell 7a9e01ac56
Updating to version 10.0.3-SNAPSHOT 2021-03-25 10:38:15 -05:00
Jesse McConnell aac6bfbd48
Updating to version 10.0.2 2021-03-25 10:21:44 -05:00
Simone Bordet 6fca106160 Reverted version to 10.0.2-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:02:45 +01:00
Lachlan Roberts b51e40892d Fix lifecycle issues with WebSocketComponents and improve testing.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-26 00:07:57 +11:00
Olivier Lamy 3d0574d64c Updating to version 10.0.3-SNAPSHOT 2021-03-25 04:10:39 +00:00
Olivier Lamy ab235ad687 Updating to version 10.0.2 2021-03-25 03:57:25 +00:00
Lachlan Roberts b0a953a9fc Do not store WebSocketComponents in Server scope.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-24 17:15:09 +11:00
Lachlan Roberts 05e1283f4f Fix licence header.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 21:52:09 +11:00
Lachlan Roberts 41ca662155 Issue #6050 - Use 'decompressed' instead of 'read' as variable name.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 21:45:19 +11:00
Lachlan Roberts 4e0a42cceb Issue #6050 - Bring PermessageDeflateBufferTest to Jetty 10.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 21:35:06 +11:00
Lachlan Roberts 7a453b44d0 Issue #6024 - protect and expose the JavaxWebSocketShutdownContainer.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-03 17:38:27 +11:00
Lachlan d9eefc9231
Merge pull request #5840 from eclipse/jetty-10.0.x-5832-WebSocketShutdownThread
Issue #5832 - shutdown Javax WSClientContainer with webapp if possible.
2021-03-01 16:00:15 +11:00
Joakim Erdfelt 9effce7558
Merge remote-tracking branch 'origin/release-10.0.1' into jetty-10.0.x 2021-02-22 11:17:22 -06:00
Lachlan Roberts 47f24db0be Issue #5832 - Improve testing for WebSocket client shutdown.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-22 21:12:57 +11:00
Lachlan Roberts ed86361581 Revert changes to ServletContainerInitializer
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-22 10:03:43 +11:00
Lachlan Roberts 7760d04a87 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5832-WebSocketShutdownThread
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-22 09:53:31 +11:00
Lachlan 4d67b30785
Merge pull request #5952 from eclipse/jetty-10.0.x-5828-JavaxWebSocketHttpClient
Issue #5828 - allow HttpClient to be used with JavaxWebSocketClientContainerProvider
2021-02-22 09:41:34 +11:00
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -06:00
Lachlan Roberts cee44ff642 JavaxWebSocketClientContainerProvider getContainer should remain protected.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-19 19:56:36 +11:00
Joakim Erdfelt d6ec96fe1b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-15 14:18:08 -06:00
Joakim Erdfelt 5dd987779c
Adding `WhitespaceAfter` checkstyle rule.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 12:48:24 -06:00
Lachlan Roberts b69f470304 Issue #5828 - only use the HttpClient constructor for JavaxWebSocketClientContainer
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-15 15:32:18 +11:00
Lachlan Roberts 0e4ed5c7b1 Issue #5828 - cleanups from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-15 15:13:02 +11:00
Lachlan 2549df99ce
Merge pull request #5935 from eclipse/jetty-10.0.x-5868-WSUpgradeRequestResponse
Issue #5868 - allow request attributes to be set in websocket upgrade
2021-02-10 10:56:18 +11:00
Lachlan Roberts 1dc98b611e Issue #5868 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-09 10:56:31 +11:00
Lachlan Roberts 805d6efedd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5828-JavaxWebSocketHttpClient 2021-02-08 17:54:49 +11:00
Lachlan Roberts 8bc84d3119 Issue #4515 - ValidationExtension should not downcast CoreSession
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-08 16:14:38 +11:00
Lachlan Roberts 2ac50130d6 Issue #5868 - allow request attributes to be set during websocket handshake
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-02 17:48:11 +11:00
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:05:57 -06:00
Joakim Erdfelt 176e29e408
Happy New Year 2021
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 12:31:00 -06:00
Lachlan Roberts c6c1ccfdd0 Rename JavaxWebSocketClientContainer.initialize to setShutdownContainer.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-20 17:00:33 +11:00
Lachlan f2cde85390
Merge pull request #5874 from eclipse/jetty-10.0.x-5866-WebSocketProgrammaticUpgrade
Issue #5866 - allow WebSocket programmatic upgrades
2021-01-20 16:07:07 +11:00
Lachlan 759805580b
Merge pull request #5860 from eclipse/jetty-9.4.x-5851-WebSocketServletCleanup
Issue #5851 - remove WebSocketServletFactory as ServletContext attribute on destroy
2021-01-20 15:50:48 +11:00
Lachlan Roberts 99aef1a2c0 Issue #5832 - fix bugs when stopping the JavaxWebSocketClientContainer
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-18 23:50:20 +11:00
Lachlan Roberts a60ecfa4cc Issue #5832 - fix bugs when stopping the JavaxWebSocketClientContainer
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-18 23:23:35 +11:00
Lachlan Roberts 29f185931e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5832-WebSocketShutdownThread 2021-01-18 16:01:18 +11:00
Joakim Erdfelt 2e53ec5384 Updating to version 9.4.37-SNAPSHOT 2021-01-14 11:27:24 -06:00
Joakim Erdfelt 238ec6997c Updating to version 9.4.36.v20210114 2021-01-14 10:29:28 -06:00
Lachlan Roberts 2f6176661a improve testing for JavaxWebSocketClientContainer shutdown
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-14 14:38:12 +11:00
Lachlan Roberts 35051dfde5 Issue #5832 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 17:54:30 +11:00
Lachlan 16acdcf7e9
Merge pull request #5852 from eclipse/jetty-10.0.x-5850-UpgradeRequestNPE
Fix NPE from WebSocketSession.getUserPrincipal() in Jetty10
2021-01-13 12:01:24 +11:00
Lachlan Roberts 0d48b8b991 Issue #5866 - add Programmatic WebSocket Upgrade to Jetty API
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 10:45:45 +11:00
Lachlan Roberts 78707fffde CreatorNegotiator should remain private, use from on WebSocketNegotiator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 09:55:19 +11:00
Lachlan Roberts 9e19e875f5 Issue #5832 - deprecate and remove usage of the ContainerInitializer utility
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-12 17:08:53 +11:00
Lachlan Roberts 2d43661fe3 Set the javax ws upgrade request in constructor.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-12 11:47:35 +11:00
Lachlan Roberts 774dac66a2 Allow shutdown of Javax WS Client Container though a SCI
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 22:56:44 +11:00
Lachlan Roberts 0a944ac0a9 Issue #5866 - allow programmatic upgrades with websocket-core
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 22:47:55 +11:00
Lachlan Roberts 6e6f83c7f2 Fix bad refactor of getMappings method.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 14:55:44 +11:00
Lachlan Roberts f738493504 Issue #5851 - remove WebSocketServletFactory as ServletContext attribute on destroy
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-05 15:05:31 +11:00
Lachlan Roberts 02963baae3 disable part of tests due to bug with ServerUpgradeResponse
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-05 08:48:55 +11:00
Lachlan Roberts 65d8131144 fix incorrect test expectation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 17:14:58 +11:00
Lachlan Roberts 69facceec3 Issue #5850 - set the UpgradeRequest in the Javax FrameHandlerFactory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 16:11:28 +11:00
Lachlan Roberts af3cce85a7 The WebSocket Upgrade Header value should be all lower case.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 15:57:23 +11:00
Lachlan Roberts 281f6d13ed Issue #5850 - add tests for the UpgradeRequests in the FrameHandlers
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 15:55:47 +11:00
Simone Bordet 480767a03b Improvements to the Jetty documentation.
Updated the WebSocket documentation in the operations guide.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-30 20:16:20 +01:00
Lachlan Roberts 3286f9a454 Issue #5832 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-24 13:59:45 +11:00
Lachlan Roberts 7a72a6ac64 Issue #5828 - allow HttpClient to be used with JavaxWebSocketClientContainerProvider
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-23 17:14:12 +11:00
Lachlan Roberts dd1d4bc1ca Issue #5832 - use lifeCycleStopping as lifeCycleStopped is never called
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-23 11:45:09 +11:00
Lachlan Roberts 25f8c65539 Issue #5832 - shutdown WSClientContainer with ContextHandler if possible
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-23 11:36:18 +11:00
Lachlan Roberts 374e02cbc3 register ShutdownThread in doStart
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-22 15:53:10 +11:00
Lachlan Roberts 97bbec7ac0 Issue #5832 - deregister ShutdownThread for WebSocketClientContainer
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-22 11:25:37 +11:00
Olivier Lamy 06df421b56
Remove javax.* dependencies (#5776)
remove non needed enforcer rule in websocket poms
force search transitive

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-22 08:17:16 +10:00
Lachlan 5611c2daa2
Merge pull request #5790 from eclipse/jetty-9.4.x-5785-WebSocketWarning
remove warning log message on CompressExtension failure
2020-12-18 18:11:47 +11:00
Lachlan Roberts c16674bae7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5706-ServerUpgradeResponse 2020-12-15 16:51:47 +11:00
Lachlan Roberts 41cffa0bc4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-12-15 16:49:23 +11:00
Joakim Erdfelt 2662be0a05
Merge pull request #5795 from eclipse/jetty-10.0.x-5784-fix-dual-license-text
Issue #5784 - fix dual license text
2020-12-11 11:37:58 -06:00
olivier lamy 9b100a5bfb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-11 12:10:35 +10:00
Olivier Lamy 639cad63fe
Jetty 9.4.x optimize parser warning from logs and add spotbug (#5735)
* enable spotbugs in CI

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

record issues

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

use warning new generation

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

activate errorprone

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

fix Jenkinsfile

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

do not run spotbugs for jetty-runner as we do not want to fix all dependencies bugs :)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

junit should allow empty results

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

maven console can be use only once...

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

one liner

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

recordissues only once

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

force id

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

aggregate results

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

configure a name for aggregated reports

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

mo more -T3 no need anymore of remote session test profile

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

I want to see what failing tests look like with new report.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

skip spotbugs for jetty-jmh

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

get rid of findbugs as we now have spotbugs

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Revert "I want to see what failing tests look like with new report."

This reverts commit df0d13e4c53d7461872e1f925ec06bd36e4a66c9.

activate errorProne parser

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

make pmd quiet for CI

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

remove -fae flag and do not display transfer progress

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

try junitParser() to see what it does

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

junit parser is a bad idea...

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

increase timeout

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

no -T2 for javadoc

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

fix skip spotbugs and pmd verbose

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* remove -T options

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 11:47:26 +10:00
Joakim Erdfelt f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-10 16:04:50 -06:00
Lachlan Roberts 9d2e350b04 Issue #5785 - remove warning on CompressExtension failure
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-10 23:22:03 +11:00
Lachlan 1753dec720
Issue #5774 - make fields and classes in Client/Server ConfigTest static (#5777)
* Issue #5774 - make fields and classes in Client/Server ConfigTest static

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-10 15:17:02 +11:00
Lachlan Roberts c9409befd8 Issue #5706 - fix potential NPE from websocket-core ServerUpgradeResponse
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-08 16:54:13 +11:00
Lachlan Roberts 8b3cffb49f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-12-08 14:34:55 +11:00
Joakim Erdfelt 9319f10425 Updating to version 10.0.1-SNAPSHOT 2020-12-02 15:30:13 -06:00
Joakim Erdfelt b9645a1737 Updating to version 10.0.0 2020-12-02 15:04:53 -06:00
Lachlan 121d898517
Move websocket-util classes into websocket-core (#5705)
- Merge websocket-util classes into websocket-core
- rename websocket-util-server to websocket-servlet
- remove websocket-util

* merge websocket-util into websocket-core-common
* move websocket-util-server implementation to websocket-core-server
* rename websocket-util-server to websocket-servlet
* Negotiator should not need the WebSocketComponents, give this to handshaker instead
* fix tests and WebSocketConfigurations
* move exception classes in websocket-core-common
* move MessageSinks and util to internal package
* create internal package for websocket-core-client
* fix JPMS warnings for websocket common modules
* Fixed exports declarations to make MethodHandles.publicLookup() working properly.
* fix broken tests with wrong WebSocketUpgradeFilter package name
* remove -T3 option to not have parallel build
* no need of jacoco here
* do no reuse forks
* remove logback dependency and disable debug log level
* make this test dynamic instead of hardcoded version...
* use -fae
* change websocket-servlet bundle symbolic name
* cleanup changes
* restore bugs....
* Updates after review.

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-02 11:10:15 +11:00
Lachlan Roberts b4fc70430c do not used fixed port in core WebSocketProxyTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-02 00:12:16 +11:00
Simone Bordet 38aec0b081 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-01 13:24:26 +01:00
Simone Bordet 51d96eced8 Removed hardcoded port.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-01 13:23:13 +01:00
Lachlan Roberts 6dce1cbffd Make ByteBufferAccumulator direct configurable
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-01 10:07:18 +11:00
Lachlan Roberts a51b5db209 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-12-01 09:45:45 +11:00
gregw 20f6dc1ace Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-30 17:33:21 +01:00
gregw 4022be8091 remove anchient README
Signed-off-by: gregw <gregw@webtide.com>
2020-11-30 15:25:40 +01:00
Ludovic Orban aa8bd5d820 replace Trie interface and impls usage with new *Index interfaces and Builders
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-11-26 14:14:16 +01:00
Lachlan Roberts 4ec2c3eca2 fix websocket proxy for jetty10 websocket api
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 21:05:06 +11:00
Lachlan Roberts cb626e72bc Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-26 20:49:49 +11:00
Lachlan Roberts fb408611e2 fix bug with WebSocketProxy ping pong counting
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 20:49:02 +11:00
Lachlan Roberts 741ad918e4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 17:20:05 +11:00
Lachlan 5941235725
Merge pull request #5726 from eclipse/jetty-9.4.x-websocketProxy
Implement and test a WebSocket Proxy with the 9.4 Jetty API
2020-11-26 16:55:36 +11:00
Lachlan Roberts e4502865b7 use WebSocketClient instead of NetworkFuzzer in the primitive echo tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 15:37:36 +11:00
Lachlan 629e2d69a4
Merge pull request #5597 from eclipse/jetty-10.0.x-CloseStatus
Cleanups to WebSocket CloseStatus
2020-11-26 12:26:42 +11:00
Lachlan Roberts 104beb9824 add IdleTimeout test, use volatile sessions
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 11:22:24 +11:00
Lachlan Roberts 6a9acaaa9d do not block for websocket PING and PONG messages
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-25 11:48:33 +11:00
Simone Bordet a812ff8db0 Fixed packages of hidden classes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-24 15:13:34 +01:00
Lachlan Roberts b89adb8dae Improve WebSocketProxy, and write tests for it
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-24 18:55:09 +11:00