Commit Graph

3654 Commits

Author SHA1 Message Date
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 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
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
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
Lachlan Roberts d7598f3ff2 basic WebSocketProxy implementation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-24 13:40:48 +11:00
Joakim Erdfelt e8683cba9f Updating to version 9.4.36-SNAPSHOT 2020-11-20 16:05:27 -06:00
Joakim Erdfelt bdc54f03a5 Updating to version 9.4.35.v20201120 2020-11-20 15:05:50 -06: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 6a83a261e1 Always add the default WebSocketUpgradeFilter as the first filter.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-18 21:27:25 +11:00
Lachlan Roberts aba2c93eae Add tests for the ordering of the default WebSocketUpgradeFilter.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-18 15:10:14 +11:00
Lachlan Roberts f52e61156d add test for a subclassed WebSocketUpgradeFilter
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 20:57:21 +11:00
olivier lamy 2c94cf0cd2 fix javadoc
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-17 16:18:04 +10:00
Lachlan b2bd86701c
Merge pull request #5638 from eclipse/jetty-10.0.x-AutobahnDocker
Run websocket autobahn-testsuite with docker in junit test
2020-11-16 16:10:24 +11:00
Lachlan Roberts 3b22c6bc66 fix broken test: AltFilterTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-16 15:57:28 +11:00
olivier lamy 3e09b86903 should exclude autobahn test per default
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-14 13:04:19 +10: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 165beff3f3 add test for multiple WebSocketUpgradeFilters
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-14 10:43:14 +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
olivier lamy 26f1e0b723 use autobahn to not run it per default
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-13 15:24:27 +10: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
olivier lamy b1b5cc3cd3 not needed anymore
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-11 19:32:13 +10:00
olivier lamy bf01cf280e exclude autobahn via surefire property
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-11 18:59:56 +10:00
olivier lamy c46920dafd activate autobahn tests only for ci profile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-11 17:48:35 +10:00
Lachlan Roberts b2979173c5 fail the junit test if there were any failed test cases
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-10 14:54:36 +11:00
Lachlan Roberts 5b9db15018 use the custom jettyproject/autobahn-testsuite image
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-10 14:42:22 +11:00
Lachlan Roberts ab8b4c3427 cleanups of AutobahnTests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-10 11:23:13 +11:00
Lachlan Roberts 42ebdc1bc3 Issue #5320 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-10 01:44:12 +11:00
Lachlan Roberts b6688c0267 Issue #5320 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 23:17:30 +11:00
Lachlan Roberts d62831fd6d Cleanups to WebSocket CloseStatus
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 19:46:08 +11:00
Lachlan Roberts 6ba1ac55b7 exclude incorrect test case 7.9.6
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 19:43:16 +11:00
Lachlan Roberts 53454e70cd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-AutobahnDocker 2020-11-09 18:16:33 +11:00
Lachlan Roberts 32433b10ad revert change to the classloader used in isAvailable
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 18:12:50 +11:00