Lachlan Roberts
200a3216f1
Issue #4568 - use jakarta.websocket for jetty-11
...
- Update the jetty-11.0.x branch to use Jakarta WebSocket API.
- Rename websocket classes, variables and comments using javax to use jakarta instead.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-31 14:54:59 +10:00
olivier lamy
f21073bd5c
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-03-27 14:26:31 +10:00
Lachlan Roberts
8943f7dd2d
remove unused imports from 9.4.x merge
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-27 10:44:35 +11:00
Lachlan Roberts
06270bf888
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-27 10:36:53 +11:00
Lachlan
d595c59622
Merge pull request #4702 from eclipse/jetty-10.0.x-4603-WS_HTTP2_NPE
...
Issue #4603 - avoid NPE during websocket HTTP/2 upgrade
2020-03-27 09:44:24 +11:00
Lachlan
fb909057a4
Merge pull request #4710 from eclipse/jetty-9.4.x-4621-SecurityHandler-ServiceLoader
...
Issue #4621 - warn instead of throwing for errors while discovering Authenticator.Factory implementations with ServiceLoader
2020-03-27 09:39:32 +11:00
Simone Bordet
2969a0a7af
Do not emit compilation warnings for test sources.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-26 18:01:27 +01:00
Simone Bordet
3ca69224a8
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-03-26 17:51:07 +01:00
Simone Bordet
6ab4cd306d
Merge pull request #4718 from eclipse/jetty-9.4.x-4714-unexpected_data_frame
...
Jetty 9.4.x 4714 unexpected data frame
2020-03-26 17:50:33 +01:00
Simone Bordet
7445449d77
Fixes #4714 - Low setMaxConcurrentStreams causes "1/unexpected_data_frame" errors.
...
Added test case.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-26 11:52:39 +01:00
Jan Bartel
0a4879e521
Issue #4707 wrong value for ServletContext.setSessionTimeout ( #4708 )
...
* Issue #4707 wrong value for ServletContext.setSessionTimeout
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-26 11:13:42 +01:00
Jesse Wilson
37cfb2fa86
Issue #4714 Updating lastRemoteStreamId on refused streams
...
Signed-off-by: Jesse Wilson <jwilson@squareup.com>
2020-03-25 22:02:20 -04:00
Simone Bordet
528d608860
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-03-25 15:22:07 +01:00
Simone Bordet
e0eb25515b
Merge pull request #4712 from eclipse/jetty-9.4.x-4711-ResetTrailers
...
Reset trailers on recycled response
2020-03-25 15:09:51 +01:00
Simone Bordet
1a3f39eef1
Issue #4711 - Reset trailers.
...
Test code cleanup.
Added test for Response.reset().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-25 15:08:43 +01:00
Greg Wilkins
f4da9760fd
Reset trailers on recycled response
...
Whilst investigating #4711 for jetty-10, it was noticed that trailers are not nulled on recycled Response instances, nor on reset.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-03-25 13:47:34 +01:00
Lachlan Roberts
85ea14e33d
Issue #4603 - clarifications in comments and improve test
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-25 22:43:43 +11:00
Jan Bartel
0c20622648
Issue #4700 ServletContext.createXXX methods should throw UnsupportedOperationException ( #4701 )
...
* Issue #4700 ServletContext.createXXX methods should throw UnsupportedOperationException
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-25 11:17:05 +01:00
Jan Bartel
57324f3cca
Issue #4697 ServletContext sessionModes methods should throw UnsupportedOperationException ( #4698 )
...
* Issue #4697 ServletContext sessionModes methods should throw UnsupportedOperationException
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-25 11:16:36 +01:00
Lachlan Roberts
929e38373c
Issue #4621 only warn on ServiceLoader failure of Authenticator.Factory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-25 19:06:11 +11:00
Lachlan
ea80253cca
Merge pull request #4694 from eclipse/jetty-10.0.x-4691-consistent_methodhandles_lookup
...
Issue #4691 - use static methods with javadoc to get MethodHandle lookups
2020-03-25 10:31:37 +11:00
Lachlan
af899b0e68
Merge pull request #4602 from eclipse/jetty-10.0.x-4340-ServiceLoader
...
Issue #4340 - Continue after ServiceLoader ServiceConfigurationError
2020-03-25 10:30:38 +11:00
Lachlan Roberts
035c6d2639
Issue #4603 - avoid NPE during websocket HTTP/2 upgrade
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-24 14:46:06 +11:00
Lachlan Roberts
c0b6d9f677
Issue #4691 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-24 14:30:02 +11:00
olivier lamy
1cde6a1d85
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-03-24 12:03:34 +10:00
olivier lamy
b7a4fb7f7e
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-03-24 11:59:35 +10:00
Olivier Lamy
e913ed233a
Issue #4654 Hazelcast configurationLocation is not configurable via mod files ( #4655 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-24 11:51:01 +10:00
olivier lamy
cd13825294
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-03-24 11:46:18 +10:00
Greg Wilkins
48cc21ca6d
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2020-03-23 17:00:17 +01:00
Joakim Erdfelt
dfc2568f46
Merge pull request #4689 from eclipse/jetty-10.0.x-4620-stderr-console-capture
...
Issue #4620 - support alt PrintStream in StdErrAppender properly
2020-03-23 08:36:11 -05:00
Jan Bartel
ea1418ac6d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-03-23 11:43:09 +01:00
Greg Wilkins
d45fd14ef8
Revert rename of Response closeOutput to completeOutput #4693
...
Revert the rename of this method and add a deprecated completeOutput to assist those that used the temporary rename.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-03-23 11:16:04 +01:00
Andrej Krota
d445d7eb5d
Fixed InfinispanSessionData serialization issues when using infinispan ( #4600 )
...
* Fixed InfinispanSessionData serialization issues when using infinispan
embedded
* Added version to InfinispanSessionDataSerializer
* Refactored InfinispanSessionDataSerializer to make use of
SessionDataMarshaller
* Tests with and without storeAsBinary enabled
* Merged InfinispanSessionDataSerializer and SessionDataMarshaller
* Wrapped Object Input/Output to Input/Output Streams
* Fixed an issue when reading the session data from a file.
* Modified tests to force read from file if available.
* static lazy init serializationContext
* synchronized initSerializationContext
Signed-off-by: Andrej Krota <andrej.krota@gmail.com>
2020-03-23 11:14:01 +01:00
Lachlan Roberts
04cc21fe40
Issue #4691 - use static methods with javadoc to get MethodHandle lookup
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-23 16:43:09 +11:00
olivier lamy
e37552b4ad
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-03-23 12:41:39 +10:00
Lachlan
d3567fc281
Merge pull request #4692 from eclipse/jetty-10.0.x-4691-consistent_methodhandles_lookup
...
Issue #4691 - Use MethodHandles.lookup() consistently in WebSocket code.
2020-03-23 11:46:01 +11:00
Lachlan Roberts
d4c2893843
Issue #4691 - Remove unnecessary throws from getMethodHandleLookup.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-23 11:44:06 +11:00
Simone Bordet
10f4fda0de
Issue #4691 - Use MethodHandles.lookup() consistently in WebSocket code.
...
* Using MethodHandles.publicLookup().in(...) instead of privateLookupIn(...).
* Moved test WebSocket EndPoint classes into the proper package, otherwise
they would not be accessible because the test package is not exported.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-22 16:42:13 +01:00
Joakim Erdfelt
fc722bff22
Issue #4620 - support alt PrintStream in StdErrAppender properly
...
+ The console-capture jetty module will reset System.err to
RollingFileOutputStream. But that's too late, as StdErrAppender
has already grabbed and is holding onto the System.err from
earlier, which means it is not writing to the new System.err.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-21 13:51:42 -05:00
olivier lamy
69bbc6c30b
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-03-21 15:13:53 +10:00
olivier lamy
6c5c98b266
cleanup duplicate dependencies
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-21 15:13:28 +10:00
olivier lamy
d1cfecb3ce
fix wrong parent
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-21 15:08:00 +10:00
olivier lamy
27e431ce41
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-03-21 15:05:42 +10:00
Chris Walker
da3bd1da8b
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
# Conflicts:
# jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc
# jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartFormInputStreamTest.java
2020-03-20 14:30:22 -05:00
Chris Walker
34488b71b6
Updating Weld documentation. Resolves #3935
2020-03-20 14:26:13 -05:00
Joakim Erdfelt
e385dea838
Do not deploy websocket test projects
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 14:04:04 -05:00
Joakim Erdfelt
7e0fff9a89
Merge pull request #4686 from eclipse/jetty-10.0.x-4685-slf4j-impl-not-included
...
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
2020-03-20 12:04:32 -05:00
Joakim Erdfelt
8456fcd039
Issue #4685 - Adding jetty-slf4j-impl to test wars WEB-INF/lib/
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:24:15 -05:00
Joakim Erdfelt
891aaa4ca7
Issue #4685 - Removing exclusion on jetty-slf4j-impl
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:23:53 -05:00
Joakim Erdfelt
43419802b7
Issue #4685 - Declare <scope> for jetty-slf4j-impl everywhere
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:12:08 -05:00