Commit Graph

72 Commits

Author SHA1 Message Date
Lachlan 33c9536d12
Merge pull request #7058 from eclipse/jetty-10.0.x-2504-WebSocketDump
Issue #2504 - expose more WebSocket details in jetty server dump
2021-12-02 19:55:50 +11:00
Lachlan Roberts bd7f1b114e Issue #2504 - expose more WebSocket details in jetty server dump
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-10-29 14:26:38 +11:00
Lachlan Roberts 5811b042b1 Issue #6965 - support programmatic upgrade for javax/jakarta websockets
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-10-07 14:22:36 +11:00
Simone Bordet 0412bdc3d9 Fixes #6938 - module-info.java file do not use the canonical order for the elements
Changed order of entries in module-info.java to be canonical

(cherry picked from commit 02691171d5)
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-10-01 09:25:55 +02: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
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 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 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 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
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
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
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 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 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
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 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
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 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 7bc4ee6509 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketUpgradeFilter 2020-11-19 07:48:16 +11:00
Lachlan Roberts 6dad0b1b7e rename WebSocketMapping to WebSocketMappings
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-14 10:46:09 +11:00
Lachlan Roberts 0493a11106 Use Filter name to identify the WebSocketUpgradeFilter.
Don't allow configuration of WebSocketMapping attribute.
The WebSocketUpgradeFilter is identified by it's name, which must be set as the fully qualified class name.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-13 22:06:20 +11:00
Lachlan Roberts a4160c4b5e Fix javadoc on websocket configuration classes.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-12 09:47:38 +11:00
Lachlan 681f46bd2a
Merge pull request #5406 from eclipse/jetty-10.0.x-WebSocketSCI
throw ISE if the WebSocketSCI configure() is called on a started ServletContextHandler
2020-10-16 17:13:19 +11:00
Lachlan Roberts 7ed6998a9c
changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 14:55:07 -05:00
Lachlan Roberts dc74bcf4cc
throw ISE if WebSocketSCI.configure() is called on started ServletContextHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 14:55:07 -05:00
Lachlan Roberts 0e3cfe8fc2 Issue #5287 - share compression pools and size with max num threads
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
Jan Bartel 77779ed6d8
Issue #4996 - Regularlize logging (#5167)
* Issue #4996 Regularize logging

Signed-off-by: Jan Bartel <janb@webtide.com>

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-24 17:15:13 +02:00
Lachlan Roberts de1077c375 Fix WebSocketServerExamplesTest to work with surefire update
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-13 22:04:56 +10:00
Lachlan Roberts 3074aa7fae Issue #5044 - Jetty Server upgrade request/response now implement the API interfaces
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-30 13:28:39 +10:00
Lachlan Roberts 0a30525653 Issue #5043 - allow WebSocketListener / Endpoint anonymous classes to be used
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 12:44:54 +10:00
Lachlan Roberts c09e4d6f86 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 08:46:29 +10:00
Lachlan Roberts 35e82c85ff Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3428-decoderLists 2020-06-29 11:33:03 +10:00
Joakim Erdfelt 6795f3915f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-12 12:04:50 -05:00
Lachlan Roberts f2dec1946d Issue #4903 - give better errors for non public javax.websocket endpoints jetty-10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-28 12:25:47 +10:00
Lachlan Roberts 2c1c25d5a7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3428-decoderLists 2020-05-28 10:29:53 +10:00
Lachlan Roberts 4b19c19815 Issue #3428 - Initial refactor to support javax websocket decoderLists
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-19 22:45:37 +10:00
Lachlan Roberts 11d14a65b4 Issue #2173 & #2174 - Split websocket-core into client/server/common modules
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-12 15:10:44 +10:00
Lachlan 2e1c01ac8c
Merge pull request #4723 from eclipse/jetty-10.0.x-WebSocketServlet
Issue #4722 - remove websocket-servlet
2020-05-07 22:45:04 +10:00
Lachlan Roberts 3a3c5e5df3 Fix broken OSGI tests due to websocket-util-server
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-01 01:35:19 +10:00
Lachlan Roberts fb85c71f8d Issue #4800 - invalid PathParam types should be reported at Deployment
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-24 17:11:23 +10:00
Lachlan Roberts 6ee0f2ebbc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketServlet 2020-04-23 13:53:10 +10:00
Lachlan Roberts 33a5db0618 Issue #4722 - fix typo for websocket-util-server jar
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-22 21:27:25 +10:00
Lachlan Roberts b58697817f Issue #4722 - create new module websocket-util-server
- This module contains the WebSocketUpgradeFilter.
- Also has an internal package with the components used
  to implement websocket upgrades common to both the
  jetty and javax websocket implementations.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-22 17:26:46 +10:00
Lachlan Roberts 213e157f42 Issue #4722 - changes from review
- Fix packages exposed in the websocket configuration
- Make servlet dependency for websocket-util optional

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-17 07:50:14 +10:00
Lachlan Roberts 625dfd1a4d Issue #4747 - Fix WS path params to work within a context path
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-07 12:18:29 +10:00
Lachlan Roberts 9298883627 Issue #4722 - fix typo in JavaxWebSocketConfiguration
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-30 10:19:37 +11:00
Lachlan Roberts 89c4504d07 Issue #4722 - remove websocket-servlet
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-27 16:31:37 +11:00
Greg Wilkins e35b3b29d6
Issue #4656 generalise XmlConfiguration elements (#4661)
* Issue #4656 generalise XmlConfiguration elements

Extended the use of Id, Class elements

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4657 Validation in XmlConfiguration

Default to validate if xerces is in the name
Fixed test harness to prepend DTD.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4657 Validation in XmlConfiguration

WIP on adding validation to XMLs

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4656 - Fix bad xml id attribute usage in jetty-maven-plugin

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

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-17 09:38:21 +01:00