30db9addbb
fixed javadoc
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 14:13:13 +11:00
e1daad1599
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 13:31:11 +11:00
3246d07ca9
Revert "Working BrowserDebugTool for jetty websocket API"
...
This reverts commit c320e020d2
2019-01-15 13:14:53 +11:00
664ddef6fd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:44:53 +11:00
39e6bff114
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:22:15 +11:00
8802aebc1b
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:19:55 +11:00
cd6964220f
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:11:43 +11:00
4bacaf21e4
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:04:20 +11:00
c320e020d2
Working BrowserDebugTool for jetty websocket API
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-14 10:13:59 -06:00
5036893426
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-12 10:30:47 +11:00
392412b2d0
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-12 10:26:09 +11:00
d89e797a1b
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-12 10:06:59 +11:00
a7e2ead7bc
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-12 09:12:02 +11:00
74df6bf1a9
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-maven-plugin/src/it/it-parent-pom/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
# jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java
# jetty-websocket/websocket-server/src/test/resources/browser-debug-tool/index.html
# jetty-websocket/websocket-server/src/test/resources/browser-debug-tool/websocket.js
2019-01-11 12:11:38 -06:00
aa7f3bd071
Merge pull request #3245 from eclipse/jetty-9.4.x-issue-3242-websocket-dump-cleanup
...
Issue #3242 - WebSocket dump cleanup
2019-01-11 11:59:06 -06:00
1b7ae00be3
Issue #3242 - Post-review cleanup of AbstractWebSocketConnection dump of EndPoint
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-11 11:27:10 -06:00
478e5ac593
Issue #3242 - Post-review cleanup of WebSocket dump
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-11 10:16:46 -06:00
6ec615dc32
happy new year
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 08:47:31 +11:00
9b0c8336ba
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 08:34:33 +11:00
020a980394
Merge pull request #3155 from eclipse/jetty-9.4.x-issue-3139-npe-websocket-sci
...
Fixes #3139 - NPE in WebSocketContainerInitializer
2019-01-08 15:57:35 -06:00
689fab4979
Issue #3242 - Cleaning up WebSocket dump
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-08 15:47:49 -06:00
0078d8aed6
Issue #3242 - Updating BrowserDebugTool to help troubleshoot issue
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-08 15:45:54 -06:00
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
729bf8299c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-23 13:51:01 +11:00
9216d5ab63
Merge pull request #3224 from lachlan-roberts/jetty-10.0.x-3216-AutobahnWebSocketServerFailures
...
Issue #3216 - Autobahn WebSocketServer failures in jetty 10
2018-12-23 13:49:35 +11:00
f5eb4864cc
Issue #3166 Jetty 10.0.x autobahn test ci ( #3221 )
...
* issue #3166 add autobahn test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 21:16:23 +10:00
8c7c5a5d01
Issue #3167 Improve websocket initialization
...
Improve on #3167 with major refactor of the context initialization of
websocket:
+ The Javax and Jetty sides are more symmetric - both use shared
filter and mapping.
+ Regularised usage of beans rather than attributes for ws components
+ Customization is now part of the mapping, so ws are configured by
how they were mapped and not by who does the upgrade.
+ Filter still can be configured to customize defaults
+ Servlet can be configured to customize any ws mappings added via the
servlet
There is still some strangeness as the WebSocketServlet is mostly
generic, yet can only map Jetty API websockets.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-22 10:30:37 +11:00
164859fb9f
Issue #3216 - Autobahn WebSocketServer failures in jetty 10
...
removed maxFrameSize from CompressExtension now use the
WebSocketChannel.getMaxFrameSize() to fix a bug where a change in the
WebSocketChanel maxFrameSize was not reaching the CompressExtension
create dummy WebSocketChannel in tests using CompressExtension without
a channel to replace the setter for maxFrameSize
increased the maxFrameSize in AutobahnWebSocketNegotiator to fix
autobahn tests being over maxFrameSize after being inflated
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-12-20 20:08:35 +11:00
3779b0384d
Issue #3167 - add the WebSocketCoreClient factory as a bean
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-12-19 15:35:32 +11:00
3bcb4d8229
Issue #3167 - lazily create the WebSocketCoreClient
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-12-18 17:19:55 +11:00
1176b267b5
removed -impl from websocket name and fixed SCI
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 10:05:10 +11:00
52d0d62594
Configure default EndpointIdentificationAlgorithm for WebSocketCoreClient
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 09:36:13 +11:00
9a67114c43
work in progress to fix websocket OSGi
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-12 17:35:46 +11:00
ff0aa965c4
Issue #3162 - Attempting to address ServiceLoader with javax.websocket (client) on OSGi
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-12 14:43:58 +11:00
252bb5dd72
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3129-websocket
2018-12-11 17:02:16 +11:00
0dcdcc7baf
Jetty 10.0.x fix surefire arg line (to avoid locale dependent build) ( #3183 )
...
* surefire.argLine replaced by jetty.surefire.argLine
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-06 09:09:06 +10:00
e8d468b3e1
work in progress
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-05 14:45:23 +01:00
e8ba030904
Issue #3129 - refactor of javax websocket package names
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-29 17:43:51 +01:00
a703fc626b
Fixes #3139 - NPE in WebSocketContainerInitializer
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-27 14:42:30 -06:00
5f972b451c
Jetty 10.0.x 2978 add module info ( #3120 )
...
Fixes #2978 - Add module-info to relevant Jetty modules.
Added module-info.java for Jetty modules that are not test modules.
Moved jetty-http test utility classes to new module "jetty-http-tools".
Removed generation of test-jar from websocket-core.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:37:35 +01:00
4013563db0
Issue #3129 Provisional fix
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-21 10:53:40 +01:00
7cb65e4f1f
Move RetainableByteBuffer to jetty-io
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-15 10:04:07 +01:00
29fd18e046
Updating to version 9.4.15-SNAPSHOT
2018-11-14 16:42:40 -06:00
c4550056e7
Updating to version 9.4.14.v20181114
2018-11-14 15:19:10 -06:00
a903017f5f
Updating to version 9.4.14-SNAPSHOT
2018-11-11 21:06:50 -06:00
49123a3313
Updating to version 9.4.13.v20181111
2018-11-11 20:02:42 -06:00
59dffebd1c
Revert backport of HttpClient executor bean handling. ( #3088 )
...
Revert to the not-so-good bean handling for the HttpClient executor
Added TODOs so that the bean handling can be updated in future.
Deprecated Websocket client setters that hide dependency on internal HttpClient instance.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-11 16:07:41 +01:00
2fd6266f62
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-11-09 18:25:03 +01:00
f814354bb5
Issue #3085 - Restore Dump methods for backwards compatibility reasons.
...
Restored removed methods to maintain backwards compatibility.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-09 17:47:46 +01:00
Greg Wilkins
Joakim Erdfelt
olivier lamy
Olivier Lamy
Lachlan Roberts
Simone Bordet