Commit Graph

20125 Commits

Author SHA1 Message Date
Lachlan 5bd4cee7c8
Fixes #4408 - fix issues with javax metadata and decoders (#4452)
Remove the metadata cache per endpoint class, to allow deployment of the same class with different EndpointConfig settings.

JavaxServerFrameHandlerFactory now matches for decoders before matching for basic onMessage signatures.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-13 13:49:10 +11:00
Joakim Erdfelt f4fc78ac66
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3578-epl2 2020-01-09 15:59:36 -06:00
Joakim Erdfelt 51c4cbeebe
Merge branch 'jetty-10.0.x-3578-epl2' of github.com:eclipse/jetty.project into jetty-10.0.x-3578-epl2 2020-01-09 15:57:20 -06:00
Joakim Erdfelt cfa476b65f
Removing Checkstyle jenkins stage (checkstyle is now always on)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-09 15:57:09 -06:00
Joakim Erdfelt 1f8ad08281
Fixing Checkstyle violations
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-09 15:56:06 -06:00
Simone Bordet ce7c993c0e Fixes #3578 - Adopt EPL-2.0 for Jetty-10.
Updated documentation files.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-09 21:56:05 +01:00
Greg Wilkins fdefa94486 fixed merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-10 07:23:56 +11:00
Greg Wilkins ee5cd7b3ea Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-01-10 07:21:41 +11:00
Greg Wilkins 96f6f2bb8d
Fix #4461 HttpOutput Aggregation (#4466)
* Issue #4461 HttpOutput Aggregation

Added tests to check that aggregation continues after first flush of an aggregated buffer (this triggers both #4461 and the discovered bug of not aggregating because of empty at capacity aggregate buffer).

Added getAggregateSize method that does a compact to avoid empty at capacity aggregate buffer

Call onWriteComplete if residue of an overflow aggregation can itself be aggregated.

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

* Issue #4461 HttpOutput Aggregation

Removed implicit compact from GzipHandler

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

* Issue #4461 HttpOutput Aggregation

Improve test coverage

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

* Issue #4461 HttpOutput Aggregation

Remove case that can never happen.

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

* Issue #4461 HttpOutput Aggregation

updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-10 07:20:54 +11:00
Joakim Erdfelt 0e0f5822c3
Issue #3578 - Adding build reactor local remote-resources
+ LICENSE and NOTICE.txt are now part of the remote-resources
  bundle on org.eclipse.jetty:build-resources:${project.version}
+ LICENSE and NOTICE.txt are managed only in one place now,
  the project root.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-09 13:59:51 -06:00
Simone Bordet 5f82e17d2f Issue #3578 - Adopt EPL-2.0 for Jetty-10.
WIP: updated copyright headers for Java files.

TODO: doc files and META-INF files inside jars.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-09 20:10:19 +01:00
Simone Bordet a2ebb1dc8a
Merge pull request #4469 from eclipse/jetty-10.0.x-4459-move_multipart_to_server
Fixes #4459 - Move multipart classes to jetty-server.
2020-01-09 17:39:12 +01:00
Simone Bordet b2907f85f3
Merge pull request #4470 from eclipse/jetty-10.0.x-4460-custom_request_log_no_parameters
Fixes #4460 - Provide a parameterless CustomRequestLog.
2020-01-09 17:36:42 +01:00
Simone Bordet a1f155b44a Fixes #4460 - Provide a parameterless CustomRequestLog.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-09 16:39:03 +01:00
Simone Bordet 4e2c3f1447 Fixes #4459 - Move multipart classes to jetty-server.
Moved multipart classes to jetty-server.
Updated jetty-http's pom.xml and module-info.java
removing the dependency on Servlet APIs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-09 16:23:05 +01:00
Simone Bordet c19d35b34f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-01-07 17:24:30 +01:00
Simone Bordet 69808d3851
Merge pull request #4454 from JLLeitschuh/patch-1
Use HTTPS instead of HTTP to download SNAPSHOT Deps
2020-01-07 17:23:57 +01:00
Simone Bordet a5c99207fc Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-01-07 17:02:40 +01:00
Simone Bordet 923ec38adf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-07 16:51:25 +01:00
Simone Bordet e3c8546667 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-07 16:35:05 +01:00
Simone Bordet de890bb1b7 Happy New Year 2020.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
Simone Bordet 8d2465c8ad Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-01-07 15:46:41 +01:00
Simone Bordet aed5a4458c Added forgotten @Deprecated annotation to deprecated method.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 15:40:46 +01:00
Jonathan Leitschuh 46140ed097 HTTPS instead of HTTP to download SNAPSHOT Deps
Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
2020-01-04 11:45:43 -05:00
Greg Wilkins 0d4e07ea1e fix OpenIdAuthenticationTest for windows build
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-04 13:31:06 +11:00
Joakim Erdfelt 2342b73fc1
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-03 14:36:16 -06:00
Joakim Erdfelt f4e7e4c3db Merge branch 'release-9.4.25' into jetty-9.4.x 2020-01-03 12:49:27 -06:00
olivier lamy ff48fba585 happy new year
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:59:21 +01:00
olivier lamy 60562ce9ee Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-01-02 21:57:05 +01:00
olivier lamy e1371a1c13 happy new year
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
Simone Bordet 7663758643 Fixes #4445 - typo Limiting Load in jetty docs.
Fixed typo.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-30 21:17:59 +01:00
Simone Bordet 3f175a1e79
Merge pull request #4436 from eclipse/jetty-10.0.x-4225-jpms_transitivity
Issue #4225 - Fix JPMS transitivity.
2019-12-30 14:31:44 +01:00
Lachlan Roberts c98897315c Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4225-jpms_transitivity 2019-12-27 19:27:59 +11:00
Lachlan 093dc8499d
Merge pull request #4441 from eclipse/jetty-10.0.x-3678-WebSocketRename
Issue #3678 - WebSocket rename for jetty-10
2019-12-27 11:44:04 +11:00
Lachlan Roberts db0edf23de Update websocket artifact IDs
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-23 13:32:21 +11:00
Lachlan Roberts db45b0b906 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3678-WebSocketRename 2019-12-23 11:03:40 +11:00
Lachlan 0d433f50f6
Issue #4401 - Fix WebSocket ClassLoader issues. (#4435)
- WebSocketCoreSession now updates the context classloader before invoking application code.
- JavaxWebSocketConfiguration now protectAndExposes JavaxWebSocketClientContainerProvider
so it can be discovered by the ServiceLoader in a webapp.
2019-12-23 09:54:08 +11:00
Joakim Erdfelt 8974176c4b Updating to version 9.4.26-SNAPSHOT 2019-12-20 11:30:41 -06:00
Joakim Erdfelt a9729c7e7f Updating to version 9.4.25.v20191220 2019-12-20 10:46:56 -06:00
Joakim Erdfelt 3290b85e8f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-12-20 10:29:21 -06:00
Joakim Erdfelt ccf04a47cd
Merge pull request #4375 from eclipse/jetty-9.4.x_small_improvment_jdbc
avoid non necessary objects allocation if session do not have any attributes data
2019-12-20 10:29:01 -06:00
Simone Bordet 7247639694 Issue #4225 - Fix JPMS transitivity.
Integrated Jetty WebSocket API 1.1.2.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-20 16:59:47 +01:00
Lachlan Roberts 78c57131ae update values for bundle-symbolic-name
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-20 16:21:34 +11:00
Lachlan Roberts bc21b354c7 Rename websocket modules and directories with new naming convention.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-20 15:41:55 +11:00
Joakim Erdfelt 0982af15f9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
2019-12-19 16:11:16 -06:00
Joakim Erdfelt cef67d9a6c
Merge pull request #4423 from eclipse/jetty-9.4.x-3730-websocket-scope-cleanup
Issue #3730 - Cleaning up Scopes in WebSocketClient
2019-12-19 16:10:16 -06:00
Simone Bordet a41b877876 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-12-19 22:13:22 +01:00
Simone Bordet af7cb94528
Merge pull request #4428 from eclipse/jetty-9.4.x-4427-httpclient_retried_request_duplicates_cookies
Fixes #4427 - Retried request duplicates cookies.
2019-12-19 22:00:15 +01:00
Joakim Erdfelt d1d8f9a779
Merge pull request #4438 from jglick/patch-1
Reduce log level of message
2019-12-19 14:59:57 -06:00
Jesse Glick bc338e7c88
Reduce log level of message
Signed-off-by: Jesse Glick <jglick@cloudbees.com>
2019-12-19 15:43:19 -05:00