18072 Commits

Author SHA1 Message Date
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
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
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
olivier lamy
85fd1db963 add jpms test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy
d9bfece0cc rename class, add more javadoc
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy
6a42d3ba08 Issue #3343 add api/tools to test jetty distribution
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy
972dc015bb sugar syntax changes
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
Simone Bordet
b786a2c826 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 10:27:45 +01:00
Simone Bordet
875af5c692 Restored Automatic-Module-Name that was removed in 471dab752.
Cleaned up pom.xml files that required a correct JPMS module name.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 10:16:07 +01:00
olivier lamy
0ef58dd42e Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-02-11 17:47:50 +10:00
olivier lamy
9c655cbd29 do not record unit test failure twice with jdk11
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 17:46:00 +10:00
Simone Bordet
b9f89af847 Fixes #3320 - Review Jetty 10 module-info.java.
Reviewed module-info.java files.
For those that have a "requires static" added a comment about
why the dependency is optional.
Rearranged directives in alphabetical order.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-08 17:30:27 +01:00
Simone Bordet
d575091c08 Fixes #3178 - BufferingResponseListener does not clear buffer in onHeaders.
Updated javadocs to specify that the class is not reusable.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-08 13:35:40 +01:00
Simone Bordet
39d8795c6d
Merge pull request #3338 from eclipse/jetty-10.0.x-3333-standalone_jpms
Fixes #3333 - Jetty 10 standalone cannot start on the module-path.
2019-02-08 11:02:58 +01:00
Simone Bordet
6f7e1e3c48 Fixes #3333 - Jetty 10 standalone cannot start on the module-path.
Added --add-modules=ALL-MODULE-PATH by default because now Jetty has
proper JPMS modules and when starting in standalone mode only the
org.eclipse.jetty.xml module will be in the module graph - while
before automatic modules where added to the module graph implicitly.

Added --add-reads=ALL-UNNAMED to the websocket module to allow the
websocket implementation to access method handles of application
classes (the websocket endpoints) that live in the web application
classloader (which forms an unnamed module).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-07 17:48:17 +01:00