Commit Graph

18187 Commits

Author SHA1 Message Date
Simone Bordet 42290828a6
Merge pull request #3357 from lachlan-roberts/jetty-10.0.x-3341-HttpClientProvider
Issue #3341 - WebSocket HttpClientProvider
2019-02-18 10:37:08 +01:00
olivier lamy 8973f01dc4 ensure we use a random for this integration test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-18 17:28:51 +10:00
Greg Wilkins c14df16494
Merge pull request #3335 from lachlan-roberts/jetty-10.0.x-3290-websocket-close
Issue #3290 - FrameFlusher and WebSocket close fixes
2019-02-18 07:30:19 +09:00
Greg Wilkins a4a6bd03e7
Fix from review
use the new close(Throwable) in endpoint
2019-02-17 18:11:23 +09:00
Joakim Erdfelt 9cdb59d4d7 Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
Simone Bordet 2e67a26dd8 Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
Fixed concurrency issue while reading the console logs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-15 18:12:45 +01:00
Joakim Erdfelt eb70b24016 Updating to version 9.4.15.v20190215 2019-02-15 11:53:00 -05:00
Joakim Erdfelt c68cb3149f
Merge pull request #3315 from eclipse/jetty-9.4.x-issue-3279-websocket-flush-hang
Issue #3279 - WebSocket May Hang Forever
2019-02-15 10:08:01 -05:00
Joakim Erdfelt 8dba440317 Issue #3279 - WebSocket Close Refactoring
+ FrameFlusher "close" frames are detected during
  enqueue and sets the state properly for failing
  other frames after it
+ Moving away from Blockhead(Client|Server) to using actual implementations
+ Moved tests to /jetty-websocket-tests/ to be able to use actual impl
  for both sides of testcase (client and server)
+ Corrected FrameFlusher terminate/close to not fail the close frame
  itself, but only frames that arrive AFTER the close frame.
+ Moving WebSocketCloseTest to jetty-websocket-tests to avoid
  using BlockheadClient / BlockheadServer in testing
+ Cleanup of unnecessary modifiers on interface
+ Logging error if @OnWebSocketError is undeclared
+ IOState removed
+ New ConnectionState tracks connection basics in a simpler
  method then IOState did.
+ No tracking of Remote close initiated (not needed)
+ IncomingFrames.incomingError() removed
+ Session delegates to Connection for all state changes
+ Errors can be communicated to application multiple times
+ Close is only communicated once

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-15 10:07:24 -05:00
Lachlan Roberts d8b5f0e1b3 Issue #3341 - HttpClientProvider changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-15 18:31:53 +11:00
Simone Bordet 94aa063e9c Fixes #3340 - Update PushCacheFilter to use Servlet 4.0 APIs.
Updated the push filters to use only the Servlet 4.0 APIs,
removing the usage of Jetty specific APIs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-14 21:07:11 +01:00
Joakim Erdfelt 14d09bac5c Fixing post-merge test failure in QuickStartTest
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-14 14:56:26 -05:00
Joakim Erdfelt 7b686fa4b6 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-02-14 10:25:59 -05:00
Joakim Erdfelt f88f856673
Merge pull request #3326 from eclipse/jetty-9.4.x-3278-empty-resourcecollection
Issue #3278 Empty ResourceCollection throws NPE
2019-02-14 10:22:48 -05:00
Joakim Erdfelt 8969c9a18c Issue #3278 - more cleanup based on review of older codebase with simone 2019-02-14 08:02:24 -05:00
Joakim Erdfelt a105c44856 Issue #3278 - code reformatting 2019-02-14 07:48:05 -05:00
Joakim Erdfelt 432ed1f584 Issue #3278 - changes from review with simone 2019-02-14 07:43:17 -05:00
Lachlan Roberts 149620598d Issue #3341 - change HttpClientProvider to interface
- HttpClientProvider is now an interface which defines a default method
newHttpClient, its static get() method get will attempt to use the
XmlHttpClientProvider to create a client, and if this fails to give a
non null client it will be created with the default newHttpClient method

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-14 16:13:43 +11:00
Lachlan Roberts c6fd7a616f Issue #3341 - Use HttpClientProvider in WebSocketCoreClient
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-14 12:19:00 +11:00
Joakim Erdfelt 1150f20ed9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3278-empty-resourcecollection 2019-02-13 17:17:42 -05:00
Joakim Erdfelt a6c626a891 Fixing Javadoc 2019-02-13 17:17:11 -05:00
Joakim Erdfelt 7ee7554b8f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3278-empty-resourcecollection 2019-02-13 17:09:38 -05:00
Simone Bordet b9797b01eb
Merge pull request #3352 from eclipse/jetty-10.0.x-3351-restructure_unixsocket
Fixed #3351 - Restructure jetty-unixsocket module.
2019-02-13 15:19:51 +01:00
Simone Bordet 92417c0954 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 15:19:09 +01:00
Simone Bordet e84feb22b3
Merge pull request #3356 from eclipse/jetty-9.4.x-3350-httpclient_default_sslcontextfactory
Issue #3350 - Do not expect to be able to connect to https URLs with …
2019-02-13 15:16:24 +01:00
Simone Bordet ec3adb0c11 Issue #3350 - Do not expect to be able to connect to https URLs with the HttpClient created from a parameterless constructor.
This is a regression introduced by fixing #2817.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 09:37:05 +01:00
Simone Bordet 1b904c0b77 Fixed #3351 - Restructure jetty-unixsocket module.
Split the original module into modules -common, -client, -server.
Added module-info.java for the new modules, referencing the JNR
JPMS module names.
Updated depedencies from old module to new modules.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 09:16:56 +01:00
Simone Bordet 477d7cf1da
Merge pull request #3342 from eclipse/jetty-10.0.x-3320-review_module_info
Fixes #3320 - Review Jetty 10 module-info.java.
2019-02-12 21:51:36 +01:00
Simone Bordet ae207bd6dc Fixes #3320 - Review Jetty 10 module-info.java.
After review, keeping "requires static" only if the
module tree can be built without the static module.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 21:17:58 +01:00
Simone Bordet 009a4659a7 Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
Made sure web apps are unpacked in a directory
within $jetty.base to avoid cluttering /tmp.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 19:21:43 +01:00
Simone Bordet 1c55e2bf79 Issue #3303 - Update to jakarta ee javax artifacts for jetty-10.
Updated javax.annotation -> jakarta.annotation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 18:56:16 +01:00
Simone Bordet 0b2ca399c0 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 17:04:43 +01:00
Simone Bordet bd6feceeb1
Merge pull request #3331 from eclipse/jetty-10.0.x-3225-sendErrorNoReason
Issue #3225 sendError does not set reason.
2019-02-12 16:20:58 +01:00
Simone Bordet 6aa917080f Issue #3347 - Fix race condition between onFillable() and resume().
Renamed Suspender -> ReadState.
Reworked the implementation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 16:15:07 +01:00
Simone Bordet a16d98ffd7
Merge pull request #3347 from shawnsmith/jetty-9.4.x-websocket-suspend-resume
Fix race condition between onFillable() and resume()
2019-02-12 15:08:43 +01:00
Simone Bordet a1e6d5856a Issue #3303 - Update to jakarta ee javax artifacts for jetty-10.
Updated javax.transaction -> jakarta.transaction.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 14:41:05 +01:00
Simone Bordet 5ce3d1bd61 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 11:23:56 +01:00
Simone Bordet 94829751a3
Merge pull request #3344 from eclipse/jetty-9.4.x_distribution_it_tests
Issue #3343 Add an API/tools to be able to test Jetty Distribution
2019-02-12 11:10:34 +01:00
Simone Bordet b2e6fae511
Merge pull request #3346 from RichardBradley/vary-origin
Include Vary:Origin on all responses from CrossOriginFilter
2019-02-12 09:31:18 +01:00
olivier lamy 265cc79225 jetty-distribution is test scope
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-12 18:22:39 +10:00
Simone Bordet 2d88b3b959 Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
Refactored streamers into class Run.
Added javadocs.
Moved "maven.resolver.version" to main POM for consistency.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 09:04:45 +01:00
olivier lamy a1a02d9942 fix CI test, distribution must be build first as we want to use a fresh build of the distro
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-12 12:25:57 +10:00
Shawn Smith e16e836aa6 Fix race condition between onFillable() and resume()
Signed-off-by: Shawn Smith <shawn@thena.net>
2019-02-11 18:08:53 -06:00
Simone Bordet 9c59db6fdd Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
Updated maven.version to 3.6.0.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 21:41:29 +01:00
Simone Bordet 3c665dfc1c Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
Added missing license header.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 21:36:14 +01:00
Simone Bordet b0207dd90d Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
Reworked the implementation.
Deleted unused stuff.
Written more tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 19:37:49 +01:00
Richard Bradley cb6b9d4a39 Include Vary:Origin on all responses
Signed-off-by: Richard Bradley <Richard.Bradley@softwire.com>
2019-02-11 14:07:41 +00:00
olivier lamy cbc9a9cff3 apply some comments from review
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 21:34:52 +10:00
olivier lamy 214bc03270 DistributionTester is definitely a better name
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy dd4041dae1 cleanup not used variable
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00