Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,052 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

3964 Commits

Author SHA1 Message Date
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 89d2ea0192 Updating to version 11.0.6-SNAPSHOT 2021-06-11 10:12:15 -05:00
Joakim Erdfelt 50df216262 Updating to version 11.0.5 2021-06-11 09:52:40 -05: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
Simone Bordet 8774ccaa0f Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-06-10 18:30:18 +02: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 063e8c80d5 Updating to version 11.0.5-SNAPSHOT 2021-06-04 13:53:06 -05:00
Joakim Erdfelt 5bcdeb52ae Updating to version 11.0.4 2021-06-04 13:35:11 -05: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 a83bff553c Updated POM versions to 11.0.4-SNAPSHOT. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-05-21 17:16:21 +02: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
Simone Bordet 2d08ed6ca0 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-05-20 15:03:52 +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 0e2a809ceb Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-05-20 18:03:08 +10: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 Roberts 409ad3b100 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-04-30 14:45:16 +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 560733b5ac Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-04-27 11:08:37 +02: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 1310983d53 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-04-27 10:36:14 +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 Roberts 933a2963c7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-04-15 20:16:23 +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 688161e41d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-04-15 20:13:47 +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 e6aa4d43f6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-04-12 14:55:16 +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 Roberts ad97c8d0a0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-31 11:01:42 +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 3ee2ba7172 Updating to version 11.0.3-SNAPSHOT 2021-03-26 06:58:38 +00:00
Olivier Lamy 14ed9a5264 Updating to version 11.0.2 2021-03-26 06:41:47 +00:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
olivier lamy 61b5e1a8af revert back to 11.0.2-SNAPSHOT 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-03-26 16:15:49 +10: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 03f6a318c7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-26 16:20:47 +11: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 e1f2f8c989
Updating to version 11.0.3-SNAPSHOT 2021-03-25 11:14:04 -05:00
Jesse McConnell 0a126e2e21
Updating to version 11.0.2 2021-03-25 10:58:33 -05: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 ade88d18cd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-19 17:16:01 +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 4f3ccd0e71 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-03 22:44:05 +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 Roberts 77537cd4f7 Fix name of jakarta.servlet.ServletContainerInitializer services file from merge. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-01 18:34:25 +11:00
Lachlan Roberts 7418657d33 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-01 16:26:18 +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 9c4100af0f
Merge remote-tracking branch 'origin/release-11.0.1' into jetty-11.0.x 2021-02-22 11:19:16 -06: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 0ca67d5492 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-22 21:36:20 +11: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 3f0f57cefc Updating to version 11.0.2-SNAPSHOT 2021-02-19 16:20:48 -06:00
Joakim Erdfelt e98092c179 Updating to version 11.0.1 2021-02-19 16:02:24 -06: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 01fb5769f4
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-15 14:18:34 -06: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
olivier lamy 538bf872a3 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-10 11:21:12 +10: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 10136235b2
Happy New Year 2021 (Jetty 11 edition) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-21 15:22:28 -06: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