3ee665700d
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedEventDriver.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyListenerEventDriver.java
2019-08-07 05:28:06 -05:00
b8f29630ed
Issue #3884 - Updating tests and fixing merge
...
+ Test cases have been updated based on PR review
+ Fixing merge from `jetty-9.4.x` that caused a duplicate
JettyListenerEventDriver.onContinuationFrame() method
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-05 12:52:20 -05:00
1ee771e991
Merge branch `jetty-9.4.x` into `jetty-9.4.x-3884-websocket-frame-listener`
2019-08-05 12:27:53 -05:00
bab274be85
fix to PartialListenerTest from merge
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-08-02 15:15:57 +10:00
41e5b9f16c
disable merged test PartialListenerTest from 9.4.x
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-02 14:24:22 +10:00
5be9f1a927
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-02 13:46:45 +10:00
f36358c631
Issue #3884 - Adding NullMessage to satisfy PR review
...
+ If an annotated Jetty WebSocket Endpoint doesn't have
a handler for data types TEXT or BINARY then the
new NullMessage (sink) is used for that specific data type
to consume (quietly) those ignored Messages.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-07-18 08:04:17 -05:00
02c49efc5f
Issue #3884 - Adding testcase to satisfy PR review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-07-18 07:51:12 -05:00
f4ce98b1c8
Issue #3884 - Pure @OnWebSocketFrame usage should not process Continuation events
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-07-17 15:51:35 -05:00
f7b212abb0
Issue #3884 - Pure WebSocketFrameListener should not process Continuation events
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-07-17 14:34:51 -05:00
f20d403480
Issue #3876 - Additional testcase
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-07-16 13:04:19 -05:00
ec9f4ef392
Issue #3876 - WebSocket Partial Listener testcases and fix
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-07-16 07:07:55 -05:00
6df9ef3a15
Updating to version 10.0.0-SNAPSHOT
2019-07-12 06:54:56 +10:00
8cbfd51e80
Updating to version 10.0.0-alpha0
2019-07-12 06:54:56 +10:00
a34e641a27
Updating to version 10.0.0-SNAPSHOT
2019-07-11 17:20:27 +10:00
2e58f2f515
Updating to version 10.0.0-alpha0
2019-07-11 14:19:45 +10:00
6eee5ad415
Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-04 14:30:45 +10:00
d8164a1728
Merge pull request #3836 from eclipse/jetty-9.4.x-3835-WebSocketSession-LifeCycle
...
Issue #3835 - ensure WebSocketSessions are always stopped
2019-07-04 12:59:49 +10:00
d4217cb20b
Merge remote-tracking branch jetty-9.4.x into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-04 12:39:03 +10:00
062444630f
Merge remote-tracking branch jetty-9.4.x into jetty-9.4.x-3835-WebSocketSession-LifeCycle
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-04 11:15:23 +10:00
d69bf31494
Issue #300 - fix test expectation after CompressExtension changes
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-04 11:10:24 +10:00
5568f833e7
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-03 16:53:00 +02:00
bb7fb48f08
Fix checkstyle warnings for tests. ( #3846 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-03 16:42:20 +02:00
1554b3dbb1
Issue #3835 - add default methods to WebSocketSessionListener
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-03 11:33:32 +10:00
07ee1d8fc6
Merge remote-tracking branch jetty-9.4.x into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-03 11:21:30 +10:00
f3f13c4ca9
Issue #2061 - fail current entry in CompressExtension on failure ( #3830 )
...
* Issue #2061 - fail current entry in CompressExtension on failure
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #2061 - do not notify callback failure twice
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-03 11:09:34 +10:00
196833d15e
Issue #3835 - fix SessionTracker dump, add test assertions
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-02 19:06:05 +10:00
2383bf4974
Issue #3835 - ensure WebSocketSessions are always stopped
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-01 16:40:45 +10:00
b7a7a53a18
Jetty 10.0.x reformat ( #3812 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"
# Conflicts:
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml
* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:42:39 +02:00
9706d70484
Jetty 9.4.x reformat ( #3811 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
internal default values.
We want to keep those values as a hedge against future default
value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:40:30 +02:00
fe051bf392
Removing deprecated methods in Jetty 10
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-20 11:41:42 -05:00
93b6619f8f
fix flaky tests in ClientConnectTest
...
race of Exception notifications between the CompletableFuture and
the FrameHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-20 18:23:32 +10:00
ec4179cf42
fix NPEs in tests from merge
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-20 11:16:45 +10:00
6f94b72667
fix build problems from bad merge
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-20 09:40:11 +10:00
22b054e0ef
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/BinaryStreamTest.java
# jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/NativeWebSocketServletContainerInitializer.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilter.java
2019-06-19 16:54:19 -05:00
5e3cecee6f
Merge pull request #3706 from eclipse/jetty-9.4.x-websocket-sci-from-embedded
...
Issue #3698 - Reworking WebSocket SCI's to be more flexible in embedded
2019-06-19 15:31:59 -05:00
372ed1455f
Issue #3661 - review of exposed classes in jetty-websocket-server ( #3779 )
...
* Issue #3661 - review of exposed classes in jetty-websocket-server
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3762 - cleanups of jetty-websocket-server
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-17 17:12:46 +10:00
a18bd12ada
Issue #3762 - use the default port of 0 for WebSocket tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-17 13:28:38 +10:00
49ee5ac3c0
Merge branch 'jetty-9.4.x' into 'jetty-9.4.x-websocket-sci-from-embedded'
2019-06-14 08:23:42 -05:00
2a2a11cd2e
Improvements after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-13 10:23:55 +02:00
790051556f
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-13 10:03:54 +02:00
6fcc3d1a77
Issue #3762 - use the default port of 0 for WebSocket tests ( #3770 )
...
* Issue #3762 - use the default port of 0 for WebSocket tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3762 - use system property to set custom port in xml
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-13 15:43:19 +10:00
9e368726d7
Attempting to address stats difference
2019-06-12 15:10:22 -05:00
fab70bd13c
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2019-06-12 12:42:42 -05:00
aa8c0bb879
Reworking testcase to be more resilient
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 12:42:28 -05:00
776c093b70
Merge branch 'release-9.4.19' into jetty-9.4.x
2019-06-12 06:44:27 -05:00
2ea0bca333
Cleanup of testcase, unable to replicate failure.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-11 13:10:55 -05:00
0d9de28226
Issue #3661 - move WebSocketSessionListener to WebSocket-API
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-11 21:08:52 +10:00
ae21126cad
Updating to version 9.4.20-SNAPSHOT
2019-06-10 13:40:17 -05:00
afcf563148
Updating to version 9.4.19.v20190610
2019-06-10 11:17:56 -05:00
Joakim Erdfelt
Lachlan Roberts
olivier lamy
olivier lamy
Jan Bartel
Greg Wilkins
Simone Bordet