Commit Graph

18367 Commits

Author SHA1 Message Date
Joakim Erdfelt 47b84fe548 Removing no longer used jetty-servlet-api from jetty-util 2019-02-27 09:29:06 -05:00
Joakim Erdfelt b33f6f3c10 Making minor changes Jmh_Jenkinsfile 2019-02-27 09:11:58 -05:00
Simone Bordet 16933f8df2 Issue #1861 - Limit total bytes pooled by ByteBufferPools.
Updated the implementation to track the oldest bucket and
release its buffers when the retained memory is exceeded.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-27 12:54:06 +01:00
Lachlan Roberts 4f0abff931 Issue #3402 - parameterized WebSocketCloseTest over TLS
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-27 15:27:26 +11:00
Olivier Lamy c3719b2bab
Add jdk12 build in Jenkinsfile (#3376)
* add jdk12 build stage
* test last release of infinispan for jdk12 build
* fix upperBound dependency for jboss logging
* upgrade juniper to 5.4.0 and disable infinispan test if JRE.JAVA_12
* Fixed annotations to exclude any JDK > 11 for 3 tests.

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-27 12:37:21 +10:00
WalkerWatch ea3339d395 Updating documentation for #3388
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2019-02-26 10:59:32 -05:00
Simone Bordet ced0361cab Issue #1861 - Limit total bytes pooled by ByteBufferPools.
Fixed the implementation to correctly track the memory retained.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-26 11:50:11 +01:00
Simone Bordet 7323b19f6f Issue #1861 - Limit total bytes pooled by ByteBufferPools.
Implemented a limit for the total memory retained by the
ByteBufferPool for both direct and heap buffers.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-26 10:56:30 +01:00
Simone Bordet f2d15f12d5 Issue #1861 - Limit total bytes pooled by ByteBufferPools.
Code cleanups + javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-25 16:14:41 +01:00
Simone Bordet 3a7dee0e18
Merge pull request #3384 from lachlan-roberts/jetty-10.0.x-3165-javax-websocket-server-tests
Issue #3165 use add-exports instead of add-opens in javax WS-Server pom
2019-02-22 08:54:41 +01:00
olivier lamy 4e81acfecb it's Jetty 10 now :)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-22 14:27:56 +10:00
lachan-roberts 037d8b9059 Issue #3165 use add-exports instead of add-opens in javax WS-Server pom
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-02-22 14:19:37 +11:00
Joakim Erdfelt ee1a7f613f Issue #3279 - Merge of FrameFlusher fix
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-21 13:56:32 -05:00
Joakim Erdfelt 3826397190
Merge pull request #3381 from eclipse/jetty-10-issue-3380-websocket-connection-listener
Issue #3380 - Adding configured Connection.Listeners to WebSocket Connections
2019-02-21 12:10:25 -05:00
Joakim Erdfelt 5e2d8603e9 Fixing Jenkinsfile javadoc JVM 2019-02-21 12:01:26 -05:00
Joakim Erdfelt 0f4294e95a Issue #3380 - Adding configured Connection.Listeners to WebSocket Connections
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-21 10:05:36 -05:00
Joakim Erdfelt cff63f2b6a Merge of `jetty-9.4.x` to `jetty-10.0.x`
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-21 09:45:12 -05:00
Olivier Lamy 259e31856a
use ${infinispan.version} rather than hardcoded version 2019-02-21 11:18:43 +10:00
Simone Bordet a76e25e3eb
Merge pull request #3360 from eclipse/jetty-10.0.x-3340_push_filter
Fixes #3340 - Update PushCacheFilter to use Servlet 4.0 APIs.
2019-02-20 19:32:41 +01:00
Greg Wilkins dcb1cc663d
Merge pull request #3366 from lachlan-roberts/jetty-10.0.x-3165-javax-websocket-server-tests
Issue #3165 - javax-websocket-server tests
2019-02-20 14:31:24 +09:00
lachan-roberts 58c0808f19 Issue #3165 - fix to javax-websocket-server module issues
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-02-20 15:15:12 +11:00
Greg Wilkins b478332793 Issue #3361 thread set setHandlers
protect handler mutation with synchronized.
Correctly use copy-on-write semantics for accessing volatile

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-20 14:15:51 +11:00
Lachlan Roberts 4378f5d08e Issue #3165 - Configure the HttpClient via XmlHttpClientProvider
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 11:30:30 +11:00
Lachlan Roberts 1e93a46eed Issue #3165 - added test for examples in javax-websocket-server
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 11:29:10 +11:00
Lachlan Roberts beff8a208e Issue #3165 - rearrange packages for javax-websocket-server tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 11:28:37 +11:00
Joakim Erdfelt 5b959f17af
Merge pull request #3354 from eclipse/jetty-9.4.x_2878_aggregated_javadoc_jar
Issue #2878 - Fixing aggregated javadoc jar
2019-02-18 17:50:08 -05:00
olivier lamy aec2ebd27d issue #2878 add an aggregated javadoc jar excluding some tests packages
+ force attach and use default phase bind (package)
+ fixing some dependencies to build aggregate javadoc jar
+ configure release plugin to build aggregated javadoc jar
+ test javadoc build with jdk11 including aggregated javadoc
+ Fixing bad javadoc
+ Excluding tests from aggregate-javadoc
+ Cannot aggregate-javadoc on CI (requires clean build of snapshot to work)
+ standardizing javadoc config

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-18 17:44:51 -05:00
Joakim Erdfelt 0e7a2738d5 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2019-02-18 16:53:53 -05:00
Simone Bordet 83b53f102c
Merge pull request #3336 from eclipse/jetty-10.0.x-3290-websocket-close
Jetty 10.0.x #3290 websocket close
2019-02-18 10:49:33 +01:00
Simone Bordet 85bc84b122 Issue #3341 - XmlHttpClientProvider
Updated comment referencing old class name.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-18 10:40:32 +01:00
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