3ec5f8fa3d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-09 16:21:08 -07:00
b0fd444a1b
File EOL issue, post-hard reset
2017-08-09 14:31:06 -07:00
952bb8dfdd
Fixing compilation
2017-08-08 10:40:58 -07:00
54367621e4
Fixing cdi/websocket pom versions
2017-08-08 09:54:09 -07:00
3fdbcffbbd
Updating to version 9.2.23-SNAPSHOT
2017-08-08 09:12:55 -07:00
a7bcac6d75
Updating to version 9.3.20.v20170531
2017-08-08 09:07:35 -07:00
796da084b4
Issue #1625 - Support new IANA declared websocket close status codes
2017-08-08 08:49:58 -07:00
ab98caafbb
Issue #1603 - fixing NPE in WebSocketServerFactory init
2017-08-08 08:49:55 -07:00
a9c329859d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-12 13:18:12 -07:00
2e8f9fc748
Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch"
...
This reverts commit 38c112764d
2017-07-12 11:28:32 -07:00
2d65605de1
Issue #1650 - fixing CDI + websocket integration
2017-07-03 09:19:17 -07:00
38c112764d
Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch
2017-06-28 16:42:37 -07:00
67cccd610a
Post cherry-pick cleanup of jetty-9.4.x...master jetty-websocket
2017-06-26 13:11:33 -07:00
877fdaba8b
Correcting error message
2017-06-26 11:59:47 -07:00
a1d65325fc
No more websocket test errors (need to work on issues)
2017-06-26 11:59:38 -07:00
8f57fe9da9
Fixing merge problems with issue-207 -> master
2017-06-26 11:59:36 -07:00
a8503a2932
Issue #207 - removing scheduler
2017-06-26 11:59:34 -07:00
55fd254161
Issue #207 - All websocket tests moved to /websocket-tests/ module
...
# Conflicts:
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
2017-06-26 11:59:09 -07:00
79f30041a1
Issue #207 - More test fixes
...
# Conflicts:
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/BinaryStreamTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java
2017-06-26 11:55:36 -07:00
8e889287fa
Issue #207 - Final removal of BlockheadClient
...
# Conflicts:
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/XBlockheadClient.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/RequestHeadersTest.java
2017-06-26 11:52:46 -07:00
5e8a7078eb
Issue #207 - more testing updates
2017-06-26 11:50:10 -07:00
dddf066e90
Issue #207 - Simplifying Connection and Close states
...
+ Removing IOState
+ Adding AtomicConnectionState
+ Adding AtomicClose
+ Reworking AbstractWebSocketConnection to be focused solely on
low level Connection handling, with little to none websocket
specifics.
+ WebSocketSession simplified
2017-06-26 11:50:08 -07:00
fcb8693c52
Issue #207 - testcase rework due to new async behaviors
...
# Conflicts:
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectionManager.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/RegexMatcher.java
2017-06-26 11:49:53 -07:00
affda23876
Issue #207 - ongoing testing improvements
2017-06-26 11:43:26 -07:00
38fefa6471
Issue #207 - Improved Error Handling
2017-06-26 11:43:24 -07:00
b93925e03e
Issue #207 - more work on policy / buffer behaviors
2017-06-26 11:43:21 -07:00
fa10576bc6
Issue #207 - initial pass through for Stream backpressure
2017-06-26 11:43:18 -07:00
1c4d658be2
Issue #207 - Careful distinction between container policy, vs session policy
...
# Conflicts:
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
2017-06-26 11:33:09 -07:00
d8f06df8b2
Fixing master tests (no longer need to specify Configuration)
2017-06-26 11:31:41 -07:00
3a37386ae9
Issue #207 - Using connection idle-timeout declared in annotation
2017-06-26 11:31:31 -07:00
1d3c1cefbe
Fixing up testcase reporting
2017-06-26 11:29:15 -07:00
1a8e79c9bb
Issue #207 - Support javax.websocket version 1.1
...
+ More testcase improvements
2017-06-26 11:29:14 -07:00
9ffb266ccb
Issue #207 - Support javax.websocket version 1.1
...
+ Cleaning up WebSocketPolicy usage
# Conflicts:
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java
2017-06-26 11:28:45 -07:00
2fac7f07aa
Issue #207 - Support javax.websocket version 1.1
...
+ Removing more EventDriver references
+ Fixing bad implementation exposed by testcases
# Conflicts:
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/AbstractJsrEventDriver.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrAnnotatedEventDriver.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointImpl.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEventDriverFactory.java
2017-06-26 11:24:30 -07:00
c03037e757
Fixing up javadoc
2017-06-26 11:23:37 -07:00
66f424cfaf
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:23:36 -07:00
31174ba434
Issue #207 - Support javax.websocket version 1.1
...
# Conflicts:
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/DecoderFactory.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/EncoderFactory.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageHandlerFactory.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageHandlerWrapper.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/AnnotatedEndpointMetadata.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/AnnotatedEndpointScanner.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/IJsrMethod.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/IJsrParamId.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrEvents.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdBase.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdBinary.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdDecoder.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdOnClose.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdOnError.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdOnMessage.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdOnOpen.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdPong.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdText.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnCloseCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnErrorCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageBinaryCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageBinaryStreamCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessagePongCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageTextCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageTextStreamCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnOpenCallable.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/Param.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/client/AnnotatedClientEndpointMetadata.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JsrClientEndpointImpl.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/client/SimpleEndpointMetadata.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/PrimitiveDecoderMetadataSet.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/PrimitiveEncoderMetadataSet.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/BinaryArrayPartialMessage.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/BinaryPartialOnMessage.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/BinaryWholeMessage.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/TextPartialMessage.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/TextPartialOnMessage.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/TextWholeMessage.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/CoderMetadata.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/CoderMetadataSet.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/DecoderMetadata.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/DecoderMetadataSet.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadata.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadataSet.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/EndpointMetadata.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/metadata/MessageHandlerMetadata.java
2017-06-26 11:20:11 -07:00
1f196f5276
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:19:01 -07:00
94ea9f5b05
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:18:59 -07:00
9a6644ec7b
Issue #207 - Support javax.websocket version 1.1
...
WIP
2017-06-26 10:57:08 -07:00
56abb626a4
Issue #207 - Support javax.websocket version 1.1
...
WIP
# Conflicts:
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
2017-06-26 10:57:05 -07:00
3906f9595f
467246 - Support javax.websocket version 1.1
...
+ WIP
2017-06-26 10:55:04 -07:00
9e0fd7faa0
Issue #1625 - Support new IANA declared websocket close status codes
2017-06-16 14:23:29 -07:00
fb3124359b
Correcting error message
2017-06-15 13:45:44 -07:00
76ace004b6
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-09 09:17:43 -07:00
c85e50a83c
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2017-06-07 11:48:56 -07:00
c1143fcc90
Issue #1603 - fixing NPE in WebSocketServerFactory init
2017-06-07 09:56:58 -07:00
bc0fd4e1ef
No more websocket test errors (need to work on issues)
2017-06-05 14:16:48 -07:00
0ac5e569d4
Fixing merge problems with issue-207 -> master
2017-06-05 10:37:41 -07:00
5d7e97993c
Merge remote-tracking branch 'origin/master' into issue-207-master
2017-06-05 10:05:05 -07:00
Joakim Erdfelt