Joakim Erdfelt
38e8202b9e
Issue #207 - Improved testing reliability
2017-06-26 11:59:31 -07:00
Joakim Erdfelt
0e2656b938
Issue #207 - Improved Close notification and testing
2017-06-26 11:59:30 -07:00
Joakim Erdfelt
30595ccdaa
Issue #207 - Adding toString()
2017-06-26 11:59:29 -07:00
Joakim Erdfelt
c0727348d6
Issue #207 - Identify non-echo client endpoint options for testing
2017-06-26 11:59:29 -07:00
Joakim Erdfelt
135e452509
Issue #207 - Change in test expectation
2017-06-26 11:59:28 -07:00
Joakim Erdfelt
644c14253d
Issue #207 - better client connect/upgrade error handling
2017-06-26 11:59:27 -07:00
Joakim Erdfelt
04afed1338
Issue #207 - stabilizing testing of Dispatched MessageSinks
2017-06-26 11:59:26 -07:00
Joakim Erdfelt
8c1d7ed8d5
Issue #207 - test compilation fix
2017-06-26 11:59:25 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
d43c8e7776
Issue #207 - MessageOutputStream fix
2017-06-26 11:57:26 -07:00
Joakim Erdfelt
239f88c158
Issue #207 - javadoc fix
2017-06-26 11:57:25 -07:00
Joakim Erdfelt
0c8d4dec9f
Issue #207 - cleaning up dispatched MessageSink threading
2017-06-26 11:57:24 -07:00
Joakim Erdfelt
8c0d9179cd
Issue #207 - CommonEndpointFunctionsTest needs started WebSocketContainerScope
2017-06-26 11:57:23 -07:00
Joakim Erdfelt
92573f1f30
Issue #207 - testing JsrSessionTest needs started ClientContainer
2017-06-26 11:57:23 -07:00
Joakim Erdfelt
262781b732
Issue #207 - testing JsrEndpointFunctions need started ClientContainer
2017-06-26 11:57:22 -07:00
Joakim Erdfelt
3931336633
Issue #207 - Restoring fillAndParse callback
2017-06-26 11:57:21 -07:00
Joakim Erdfelt
6b203f5187
Issue #207 - more test fixes
2017-06-26 11:57:20 -07:00
Joakim Erdfelt
ad29d65229
Issue #207 - more test induced fixes
...
# Conflicts:
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/IdleTimeoutTest.java
2017-06-26 11:57:00 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
4a4069d0c2
Issue #207 - more testing updates and mainline code fixes
2017-06-26 11:53:30 -07:00
Joakim Erdfelt
c065f7d125
Issue #207 - simplifying OnUpgradeTo prefill + parse, with test
2017-06-26 11:53:29 -07:00
Joakim Erdfelt
92f8f594d1
Issue #207 - removing ignoreBrokenPipe
2017-06-26 11:53:28 -07:00
Joakim Erdfelt
5ab7bf37b2
Issue #207 - websocket-client test cleanup
2017-06-26 11:53:27 -07:00
Joakim Erdfelt
2bab817c6b
Issue #207 - common test cleanup
2017-06-26 11:53:26 -07:00
Joakim Erdfelt
9345bc3d5a
Issue #207 - more test fixes
2017-06-26 11:53:26 -07:00
Joakim Erdfelt
9fd70d3d6f
Issue #207 - more test failure fixes
2017-06-26 11:53:25 -07:00
Joakim Erdfelt
4cea9f307a
Issue #207 - Adding missing JSR356 Server @PathParam ArgIdentifier
2017-06-26 11:53:24 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
e4790fea72
Issue #207 - Removing BlockheadServer
2017-06-26 11:51:51 -07:00
Joakim Erdfelt
88b2c47904
Issue #207 - moved some JSR356 tests to websocket-tests
...
# Conflicts:
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EncoderTest.java
2017-06-26 11:51:47 -07:00
Joakim Erdfelt
06f204f794
Issue #207 - moved client tests to websocket-tests
...
# Conflicts:
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowServerTest.java
2017-06-26 11:50:54 -07:00
Joakim Erdfelt
590aa59c37
Issue #207 - fixing javadoc
2017-06-26 11:50:13 -07:00
Joakim Erdfelt
1d18522a99
Issue #207 - allowing untrusted sessions to have non-validating generators
2017-06-26 11:50:13 -07:00
Joakim Erdfelt
36f40689cc
Issue #207 - websocket-common test fixes
2017-06-26 11:50:12 -07:00
Joakim Erdfelt
3d6263aafb
Issue #207 - more review rework
2017-06-26 11:50:11 -07:00
Joakim Erdfelt
5e8a7078eb
Issue #207 - more testing updates
2017-06-26 11:50:10 -07:00
Greg Wilkins
7148db67dc
tidy up close
2017-06-26 11:50:09 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
3888cd5347
Issue #207 - improve port handling in URI conversions
2017-06-26 11:43:27 -07:00
Joakim Erdfelt
affda23876
Issue #207 - ongoing testing improvements
2017-06-26 11:43:26 -07:00
Joakim Erdfelt
b2fa9cd23a
Issue #207 - fixing compilation error
2017-06-26 11:43:25 -07:00
Joakim Erdfelt
38fefa6471
Issue #207 - Improved Error Handling
2017-06-26 11:43:24 -07:00
Joakim Erdfelt
d5151ddc90
Issue #207 - remove IncomingFrames#incomingError(throwable)
2017-06-26 11:43:22 -07:00
Joakim Erdfelt
b93925e03e
Issue #207 - more work on policy / buffer behaviors
2017-06-26 11:43:21 -07:00
Joakim Erdfelt
aae4a24726
Issue #207 - reworking I/O to allow streaming backpressure
2017-06-26 11:43:20 -07:00
Joakim Erdfelt
be747c44e1
Issue #207 - removing unused section
2017-06-26 11:43:19 -07:00
Joakim Erdfelt
fa10576bc6
Issue #207 - initial pass through for Stream backpressure
2017-06-26 11:43:18 -07:00
Joakim Erdfelt
c3bb6ae535
Issue #207 - Cleaning up Args vs Signature classes
...
# Conflicts:
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/reflect/ArgSwitch.java
2017-06-26 11:37:11 -07:00
Joakim Erdfelt
2ee819c2c6
Issue #207 - adding addMessageHandler(<lambda>) tests
2017-06-26 11:33:34 -07:00
Joakim Erdfelt
0672f621e5
Issue #207 - Cannot catch PING in JSR356
2017-06-26 11:33:33 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
70d4850ed1
Issue #207 - working @PathParam support
2017-06-26 11:31:42 -07:00
Joakim Erdfelt
d8f06df8b2
Fixing master tests (no longer need to specify Configuration)
2017-06-26 11:31:41 -07:00
Joakim Erdfelt
3c790ab64e
Issue #207 - fixing EchoTest
2017-06-26 11:31:40 -07:00
Christoph Dreis
41d4b59c19
Precompile pattern for checking of classes in javax package in ReflectUtils
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-06-26 11:31:39 -07:00
Joakim Erdfelt
75c5793f38
Issue #207 - @PathParam support fixes
...
+ Arg.tag is now exposed for general use
+ JsrEndpointFunctions now decode (into primitives) the URI template
exposed @PathParam static arguments
+ JsrEndpointFunctions simplified tracking of static args
+ ServerContainer.assertValidEndpoint() now validates
added endpoints with @PathParam immediately (per spec)
using a UriTemplate where each variable is an empty string
2017-06-26 11:31:37 -07:00
Joakim Erdfelt
f790bf75d8
Issue #207 - prevent overlapping websocket streaming dispatch
...
+ when FIN==true, wait for dispatch to return before processing
more frames
2017-06-26 11:31:36 -07:00
Joakim Erdfelt
52a8101cd2
Issue #207 - ensuring WebSocketServerFactory init occurs earlier
2017-06-26 11:31:35 -07:00
Joakim Erdfelt
61dc476342
Removing eclipse detrius
2017-06-26 11:31:34 -07:00
Joakim Erdfelt
527e5f8e4c
Issue #207 - improving errors for Encoders/Decoders
2017-06-26 11:31:33 -07:00
Joakim Erdfelt
d10de87e09
Issue #207 - javax.websocket.DeploymentException thrown at addEndpoint now
2017-06-26 11:31:32 -07:00
Joakim Erdfelt
3a37386ae9
Issue #207 - Using connection idle-timeout declared in annotation
2017-06-26 11:31:31 -07:00
Joakim Erdfelt
fa635f5ecd
Issue #207 - correcting lifecycle of WebSocketSession and EndpointFunctions
...
# Conflicts:
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectPromise.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
2017-06-26 11:30:35 -07:00
Joakim Erdfelt
1d3c1cefbe
Fixing up testcase reporting
2017-06-26 11:29:15 -07:00
Joakim Erdfelt
1a8e79c9bb
Issue #207 - Support javax.websocket version 1.1
...
+ More testcase improvements
2017-06-26 11:29:14 -07:00
Joakim Erdfelt
43ef087efd
Issue #207 - Support javax.websocket version 1.1
...
+ Correcting tests
2017-06-26 11:29:12 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
bfe0584356
Issue #207 - Support javax.websocket version 1.1
...
+ Correcting jsr server PathParam static args sort issue
2017-06-26 11:25:45 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
c03037e757
Fixing up javadoc
2017-06-26 11:23:37 -07:00
Joakim Erdfelt
66f424cfaf
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:23:36 -07:00
Joakim Erdfelt
4c01fd96c8
Issue #207 - Support javax.websocket version 1.1
...
# Conflicts:
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointMetadata.java
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrPathParamId.java
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrServerEndpointImpl.java
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrServerExtendsEndpointImpl.java
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/SimpleServerEndpointMetadata.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/OnPartialTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScanner_GoodSignaturesTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScanner_InvalidSignaturesTest.java
2017-06-26 11:23:00 -07:00
Joakim Erdfelt
df584babc0
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:22:41 -07:00
Joakim Erdfelt
a1333786a9
Issue #207 - Support javax.websocket version 1.1
...
# Conflicts:
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderFactoryTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EncoderFactoryTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/MessageHandlerFactoryTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrParamIdDecoderTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/decoders/PrimitiveDecoderMetadataSetTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/metadata/DecoderMetadataSetTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadataSetTest.java
2017-06-26 11:22:27 -07:00
Joakim Erdfelt
53c9435183
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:20:14 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
357fae18ae
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:19:02 -07:00
Joakim Erdfelt
1f196f5276
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:19:01 -07:00
Joakim Erdfelt
94ea9f5b05
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:18:59 -07:00
Joakim Erdfelt
c8ffaec032
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:18:58 -07:00
Joakim Erdfelt
c5954fc5d6
Trailing merge fixes
2017-06-26 11:18:57 -07:00
Joakim Erdfelt
c4f7d03138
Issue #207 - Support javax.websocket version 1.1
...
WIP
# Conflicts:
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/encoders/DualEncoder.java
2017-06-26 11:18:41 -07:00
Joakim Erdfelt
b3edcce8e7
Issue #207 - Support javax.websocket version 1.1
...
WIP
# Conflicts:
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScanner_GoodSignaturesTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScanner_InvalidSignaturesTest.java
2017-06-26 10:57:23 -07:00
Joakim Erdfelt
9a6644ec7b
Issue #207 - Support javax.websocket version 1.1
...
WIP
2017-06-26 10:57:08 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
cd15a57a5e
Issue #207 - Support javax.websocket version 1.1
...
WIP
# Conflicts:
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectPromise.java
2017-06-26 10:56:45 -07:00
Joakim Erdfelt
9acd03f0d9
Issue #207 - Support javax.websocket version 1.1
...
WIP
2017-06-26 10:55:20 -07:00
Joakim Erdfelt
0a6fd16b52
Issue #207 - Support javax.websocket version 1.1
...
WIP
2017-06-26 10:55:18 -07:00
Joakim Erdfelt
cbf8c971aa
467246 - Support javax.websocket version 1.1
...
WIP
2017-06-26 10:55:17 -07:00
Joakim Erdfelt
3906f9595f
467246 - Support javax.websocket version 1.1
...
+ WIP
2017-06-26 10:55:04 -07:00
Joakim Erdfelt
005ecbd704
More websocket test fixes
2017-06-21 14:10:08 -07:00
Joakim Erdfelt
31705767f0
Enabling more websocket tests
2017-06-21 07:56:48 -07:00
Joakim Erdfelt
4f2c31867e
Turning down logging level
2017-06-20 13:43:21 -07:00
Joakim Erdfelt
d7483934a0
Correcting dumps to only occur during DEBUG
2017-06-20 13:42:53 -07:00
Joakim Erdfelt
157fc4140b
Fixing WebSocket MessageReceivingTest
2017-06-20 13:40:30 -07:00
Joakim Erdfelt
d0513ecbe6
Restoring JSR356 Session.setMax*MessageBufferSize() spec behavior
2017-06-20 13:40:05 -07:00
Joakim Erdfelt
b7959456fb
Removing bad log silencing technique
2017-06-20 13:39:27 -07:00
Joakim Erdfelt
03afcc8487
Hightlighting double-close issue better in logs
2017-06-20 09:55:48 -07:00
Joakim Erdfelt
8d18118688
Reader-Self not relevant, removing
2017-06-20 09:55:21 -07:00
Joakim Erdfelt
5638f7b25b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-16 14:33:01 -07:00
Joakim Erdfelt
9e0fd7faa0
Issue #1625 - Support new IANA declared websocket close status codes
2017-06-16 14:23:29 -07:00
Joakim Erdfelt
d8775c77d9
Issue #1616 - Making test more reliable
2017-06-15 13:36:03 -07:00
Joakim Erdfelt
c496dd7961
Testing / UntrustedWSServer improvements
2017-06-15 13:35:40 -07:00
Joakim Erdfelt
e1ebcdaf18
Correcting error message
2017-06-15 13:34:17 -07:00
Joakim Erdfelt
fc15da79d4
Issue #1616 enabling debug output for CI testing
2017-06-14 16:19:44 -07:00
Joakim Erdfelt
08962366ee
Disabling test in master
2017-06-14 16:18:18 -07:00
Joakim Erdfelt
d02a14eeed
WebSocket SuspendResume updated tests and notes from review
2017-06-14 11:14:59 -07:00
Joakim Erdfelt
7786d0fc2b
WebSocket Client sending Close/ProtocolError should also see onError
2017-06-14 10:01:01 -07:00
Joakim Erdfelt
b31de636b4
Squelching Stacktraces
2017-06-14 08:43:10 -07:00
Joakim Erdfelt
272679b39c
Reviewing more @Ignore'd WebSocket tests
2017-06-13 14:23:09 -07:00
Joakim Erdfelt
00beb607fc
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-13 10:40:02 -07:00
Joakim Erdfelt
bd751b6ce2
Issue #1599 - WebSocketClient early close scenarios
...
+ Connection timeout results in:
endpoint.onError(WebSocketTimeoutException)
localSession.close(SHUTDOWN)
2017-06-13 09:47:44 -07:00
Joakim Erdfelt
67022482e5
Issue #1605 - common executor and bufferpool for jsr356 client
2017-06-12 09:23:23 -07:00
Joakim Erdfelt
76ace004b6
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-09 09:17:43 -07:00
Joakim Erdfelt
caff2b932d
Issue #1605 - restoring default behavior of ContainerProvider.getWebSocketContainer()
...
+ Allowing users to reconfigure JettyClientContainerProvider to restore
the Jetty 9.4.x behavior for singletons and ServerContainer behaviors
2017-06-07 14:16:16 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
064c1bc39a
Issue #1604 - WebSocketContainer stop is now smarter
2017-06-07 11:48:36 -07:00
Joakim Erdfelt
c1143fcc90
Issue #1603 - fixing NPE in WebSocketServerFactory init
2017-06-07 09:56:58 -07:00
Joakim Erdfelt
0e5af3cc28
Reduce testing noise
2017-06-06 14:48:38 -07:00
Joakim Erdfelt
4d2c299fe8
Updating to version 9.2.23-SNAPSHOT
2017-06-06 08:55:12 -07:00
Joakim Erdfelt
ccea772fc3
Disabling problematic test temporarily
2017-06-06 08:42:44 -07:00
Greg Wilkins
ad76aa6c65
Issue #1503 Optionally strip IPv6. Default true
2017-06-06 17:07:14 +02:00
Joakim Erdfelt
0af30bce5a
Updating to version 9.2.22.v20170606
2017-06-06 07:03:05 -07:00
Joakim Erdfelt
059aa3cbe0
Adding more leniency on connection fault tests
2017-06-05 16:24:53 -07:00
Joakim Erdfelt
88106fd355
WebSocket test fix
2017-06-05 14:26:53 -07:00
Joakim Erdfelt
bc0fd4e1ef
No more websocket test errors (need to work on issues)
2017-06-05 14:16:48 -07:00
Joakim Erdfelt
f98b4bd087
Fixing javadoc error
2017-06-05 11:16:45 -07:00
Joakim Erdfelt
0ac5e569d4
Fixing merge problems with issue-207 -> master
2017-06-05 10:37:41 -07:00
Joakim Erdfelt
5d7e97993c
Merge remote-tracking branch 'origin/master' into issue-207-master
2017-06-05 10:05:05 -07:00
Joakim Erdfelt
3e83908c58
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-06-05 10:02:01 -07:00
Joakim Erdfelt
99fbc30f92
Issue #207 - Close Handshake Test refactor
2017-06-05 09:48:07 -07:00
Simone Bordet
b953f8d2d0
Merged branch 'jetty-9.4.x' into 'master'.
2017-06-05 18:07:51 +02:00
Joakim Erdfelt
6a3c40e935
Updating to version 9.4.7-SNAPSHOT
2017-05-31 17:26:34 -07:00
Joakim Erdfelt
8ba0f2d95d
Updating to version 9.4.6.v20170531
2017-05-31 16:22:52 -07:00
Joakim Erdfelt
429380d36a
Updating to version 9.3.21-SNAPSHOT
2017-05-31 16:10:04 -07:00
Joakim Erdfelt
0f3b1cbe36
Updating to version 9.3.20.v20170531
2017-05-31 15:24:57 -07:00
Joakim Erdfelt
0f98e607e8
Issue #1514 - fixing bad websocket dump output
2017-05-31 13:36:27 -07:00
Joakim Erdfelt
8ca70c691c
Issue #1569 - relaxing WebSocketPolicy.setMax*MessageSize checks
...
+ Allow setting of the max (binary|text) message size to -1 to
have unconstrained message sizes.
+ Disconnect message size from buffer size in JSR356 Session calls
2017-05-31 13:06:36 -07:00
Joakim Erdfelt
79b822339c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-31 06:18:40 -07:00
Greg Wilkins
32bc9292a2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-31 11:56:47 +02:00
Joakim Erdfelt
355f4ed7f3
Removing redundant new URI
2017-05-30 12:16:10 -07:00
Joakim Erdfelt
ae496051de
Fixing confusing wss -> https case
2017-05-30 12:15:01 -07:00
Greg Wilkins
ab4d300ae7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-30 17:43:19 +02:00
Greg Wilkins
50500ac99d
Issue #1568 handle query strings with encoded characters
2017-05-24 23:03:22 +02:00
Greg Wilkins
78280d0595
Issue #1568 handle query strings with encoded characters
2017-05-24 09:22:16 +02:00
Joakim Erdfelt
4731470188
Issue #1568 - fixing accidental NPE with no query
2017-05-23 11:59:39 -07:00
Joakim Erdfelt
296050dfc4
Issue #1568 - Fixing improper query encoding in WebSocket ServletUpgradeRequest
2017-05-23 10:32:22 -07:00
Greg Wilkins
d3e50f8f80
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-22 23:37:51 +02:00
Joakim Erdfelt
e3bab3df22
Issue #1528 - Use WebSocketContainer out of current context
...
+ Interrogate ServletContext, ContextHandler, and Context
for an active ServerContainer before returning a new ClientContainer
2017-05-19 13:50:40 -07:00
Joakim Erdfelt
e001fe0355
Issue #1528 - pull preconfigured HttpClient from attributes
...
+ Search ServletContext attributes first
+ Search Server attributes next
2017-05-19 08:27:53 -07:00
Joakim Erdfelt
7b2a0e380d
Using ThreadClassLoaderScope
2017-05-18 16:13:16 -07:00
Joakim Erdfelt
75101dfa0c
Issue #1528 - WebSocketClient can use jetty-websocket-httpclient.xml
...
+ Will use XML resource (if jetty-xml is present, and resource found)
to load the HttpClient configuration that should be used by the
new WebSocketClient() instance.
2017-05-18 15:06:22 -07:00
Joakim Erdfelt
9b4bfbc680
Issue #1544 - Identifying context that JSR-356 was disabled for in configuration
2017-05-18 14:03:16 -07:00
Joakim Erdfelt
1ba61e8e0c
Issue #207 - removing scheduler
2017-05-15 13:38:45 -07:00
Joakim Erdfelt
4e2f6265eb
Issue #207 - stabilizing testcase
2017-05-15 13:16:54 -07:00
Joakim Erdfelt
77252270ff
Post-merge cleanup
2017-05-15 10:06:47 -07:00
Joakim Erdfelt
04b6afe879
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-05-15 09:48:41 -07:00
Joakim Erdfelt
873c3554e7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-12 14:06:21 -07:00
Joakim Erdfelt
016cbfa5f4
Issue #207 - UntrustedWSServlet should have a slightly higher then default max message size
2017-05-11 13:26:03 -07:00
Joakim Erdfelt
2ed56d4142
Issue #207 - Improved testing reliability
2017-05-11 13:20:31 -07:00
Joakim Erdfelt
5701de4fd8
Issue #207 - Improved Close notification and testing
2017-05-11 11:07:41 -07:00
Joakim Erdfelt
92741b2116
Issue #207 - Adding toString()
2017-05-11 10:59:32 -07:00
Joakim Erdfelt
6cfcbeffad
Issue #207 - Identify non-echo client endpoint options for testing
2017-05-11 10:59:16 -07:00
Joakim Erdfelt
e84e875e14
Issue #207 - Change in test expectation
2017-05-11 10:57:31 -07:00
Joakim Erdfelt
c75e3c19d9
Issue #1516 - making WebSocket started thread pools have identifying names
2017-05-11 09:52:02 -07:00
Joakim Erdfelt
b1f8f492b9
Issue #207 - better client connect/upgrade error handling
2017-05-11 07:06:18 -07:00
Joakim Erdfelt
500ae69409
Issue #207 - stabilizing testing of Dispatched MessageSinks
2017-05-11 06:05:37 -07:00
Greg Wilkins
cbe857de01
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-11 10:08:36 +02:00
Joakim Erdfelt
27f03dbc25
Issue #207 - test compilation fix
2017-05-10 18:12:31 -07:00
Joakim Erdfelt
2043a923cf
Issue #207 - All websocket tests moved to /websocket-tests/ module
2017-05-10 16:56:03 -07:00
Joakim Erdfelt
2679715a30
Silencing bogus JSR356 IdleTimeoutTest warning
2017-05-10 12:13:24 -07:00
Joakim Erdfelt
427408c251
JSR356 ClientContainer testing fix
2017-05-10 09:48:51 -07:00
Joakim Erdfelt
a7b164e6b9
Fixing JSR356 Client tests
2017-05-10 07:46:56 -07:00
Joakim Erdfelt
f1a89ce3b2
Issue #207 - MessageOutputStream fix
2017-05-09 17:17:07 -07:00
Joakim Erdfelt
869ccf4421
Issue #207 - javadoc fix
2017-05-09 15:27:15 -07:00
Joakim Erdfelt
753ed9e603
Issue #1516 - Delay starting of WebSocketClient
2017-05-09 12:58:22 -07:00
Joakim Erdfelt
4bae04b623
Issue #207 - cleaning up dispatched MessageSink threading
2017-05-09 12:20:46 -07:00
Joakim Erdfelt
d0c7f822f7
Issue #207 - CommonEndpointFunctionsTest needs started WebSocketContainerScope
2017-05-08 07:18:58 -07:00
Joakim Erdfelt
546ccf5814
Issue #207 - testing JsrSessionTest needs started ClientContainer
2017-05-08 07:16:36 -07:00
Joakim Erdfelt
d1281565ff
Issue #207 - testing JsrEndpointFunctions need started ClientContainer
2017-05-08 07:15:03 -07:00
Joakim Erdfelt
b73b531d62
Issue #207 - Restoring fillAndParse callback
2017-05-08 05:19:11 -07:00
Joakim Erdfelt
55e435c741
Issue #207 - more test fixes
2017-05-05 12:37:44 -07:00
Joakim Erdfelt
3b31ecc2b1
Issue #207 - more test induced fixes
2017-05-04 13:37:29 -07:00
Joakim Erdfelt
c2626cf1f2
Issue #207 - More test fixes
2017-05-03 16:59:54 -07:00
Joakim Erdfelt
e36ffe1f86
Issue #207 - more testing updates and mainline code fixes
2017-05-02 17:06:53 -07:00
Joakim Erdfelt
cf56168f7d
Updating to version 9.3.20-SNAPSHOT
2017-05-02 15:26:56 -07:00
Joakim Erdfelt
d36d57d5c7
Updating to version 9.3.19.v20170502
2017-05-02 14:31:51 -07:00
Joakim Erdfelt
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
Joakim Erdfelt
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
Greg Wilkins
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
Joakim Erdfelt
89f76e0037
Issue #207 - simplifying OnUpgradeTo prefill + parse, with test
2017-04-28 17:11:56 -07:00
Joakim Erdfelt
e200f66ded
Issue #207 - removing ignoreBrokenPipe
2017-04-28 13:18:13 -07:00
Joakim Erdfelt
a2a2aac6ad
Issue #207 - websocket-client test cleanup
2017-04-28 13:17:04 -07:00
Joakim Erdfelt
94182b7134
Issue #207 - common test cleanup
2017-04-28 13:16:43 -07:00
Joakim Erdfelt
081663e522
Issue #207 - more test fixes
2017-04-28 09:41:58 -07:00
Joakim Erdfelt
002ba9cf00
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
...
Conflicts:
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/AltFilterTest.java
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeAnnotatedTest.java
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeContainerTest.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/DecoratorsTest.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/TestABCase3.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/WebSocketCloseTest.java
2017-04-28 06:01:06 -07:00
Joakim Erdfelt
56fac5fdb1
Issue #207 - more test failure fixes
2017-04-27 16:26:32 -07:00
Joakim Erdfelt
d216206fcd
Issue #207 - Adding missing JSR356 Server @PathParam ArgIdentifier
2017-04-27 13:18:14 -07:00
Joakim Erdfelt
ae51344582
Issue #207 - Final removal of BlockheadClient
2017-04-27 11:21:04 -07:00
Joakim Erdfelt
7f345fc2d4
Issue #207 - Removing BlockheadServer
2017-04-26 18:25:06 -07:00
Joakim Erdfelt
641d051e97
Issue #207 - moved some JSR356 tests to websocket-tests
2017-04-26 18:13:56 -07:00
Joakim Erdfelt
e276705948
Issue #207 - moved client tests to websocket-tests
2017-04-26 16:01:07 -07:00
Joakim Erdfelt
0195812f18
Disabling more flaky tests that are fixed in issue-207 branch
2017-04-26 11:34:57 -07:00
Joakim Erdfelt
240b82be70
Disabling currently flaky tests that are fixed in issue-207 branch
2017-04-26 08:45:59 -07:00
Joakim Erdfelt
ee6d495af4
Issue #207 - fixing javadoc
2017-04-25 12:41:16 -07:00
Joakim Erdfelt
4c5dd93b30
Issue #1502 - Changing WSUF target creation used by PathMappings match
2017-04-24 16:08:37 -07:00
Joakim Erdfelt
38e0976513
Issue #207 - allowing untrusted sessions to have non-validating generators
2017-04-21 17:21:47 -07:00
Joakim Erdfelt
6e797f5e7d
Issue #207 - websocket-common test fixes
2017-04-21 16:39:27 -07:00
Joakim Erdfelt
683509be60
Issue #207 - more review rework
2017-04-21 16:21:07 -07:00
Joakim Erdfelt
f9e2f5f96e
Merge remote-tracking branch 'origin/jetty-9.4.x-websocket-review' into issue-207
...
Conflicts:
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java
2017-04-21 09:04:56 -07:00
Joakim Erdfelt
849ad7c917
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-04-21 09:00:54 -07:00
Joakim Erdfelt
ce9cd8d168
Issue #207 - more testing updates
2017-04-21 09:00:30 -07:00
Greg Wilkins
ca2423985c
tidy up close
2017-04-21 17:14:26 +10:00
Joakim Erdfelt
a8d4c68bdc
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-04-14 16:19:05 -07:00
Joakim Erdfelt
92ea5bda21
Updating to version 9.4.5-SNAPSHOT
2017-04-14 14:43:36 -07:00
Joakim Erdfelt
3dc8f557c6
Updating to version 9.4.4.v20170414
2017-04-14 13:20:17 -07:00
Greg Wilkins
23a9c6c1be
Issue #1463
2017-04-12 14:54:18 +10:00
Joakim Erdfelt
7e2e64e856
Issue #207 - testcase rework due to new async behaviors
2017-04-11 15:46:47 -07:00
Joakim Erdfelt
d2d5c0e4a4
Issue #207 - improve port handling in URI conversions
2017-04-11 09:11:53 -07:00
Joakim Erdfelt
9620d5c5e8
Issue #207 - ongoing testing improvements
2017-04-07 16:24:12 -07:00
Joakim Erdfelt
2d01d1431a
Issue #207 - fixing compilation error
2017-04-07 14:34:35 -07:00
Joakim Erdfelt
9199ec8843
Issue #207 - Improved Error Handling
2017-04-07 14:30:15 -07:00
Joakim Erdfelt
c59afd70f0
Issue #207 - remove IncomingFrames#incomingError(throwable)
2017-04-07 13:20:50 -07:00
Joakim Erdfelt
9adbf2b361
Issue #207 - more work on policy / buffer behaviors
2017-04-07 12:03:05 -07:00
Joakim Erdfelt
73ca336014
Issue #207 - reworking I/O to allow streaming backpressure
2017-04-06 15:58:35 -07:00
Joakim Erdfelt
f2c09d5388
Issue #207 - removing unused section
2017-04-06 12:23:59 -07:00
Joakim Erdfelt
9e2aeda052
Updating to version 9.3.19-SNAPSHOT
2017-04-06 07:47:53 -07:00
Joakim Erdfelt
63273aa40b
Updating to version 9.3.18.v20170406
2017-04-06 06:31:02 -07:00
Joakim Erdfelt
893b153cb3
Issue #207 - initial pass through for Stream backpressure
2017-04-05 17:30:51 -07:00
Greg Wilkins
dd084b4e74
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-30 17:20:22 +11:00
Joakim Erdfelt
b8ddef08d6
Merge remote-tracking branch 'origin/release-9.4.3' into jetty-9.4.x
2017-03-22 09:31:44 -07:00
dreis2211
83fbd5bf0d
Issue #1411 - Use short-circuit operator in websocket Frame
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-03-19 19:31:36 +01:00
Joakim Erdfelt
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
Joakim Erdfelt
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
Joakim Erdfelt
a6a0ab991f
Updating to version 9.3.18-SNAPSHOT
2017-03-17 09:48:19 -07:00
Joakim Erdfelt
307d23975e
Updating to version 9.3.17.v20170317
2017-03-17 09:07:39 -07:00
Joakim Erdfelt
9273d99a99
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-03-15 15:07:17 -07:00
Stefan Schmidt
ab5e94f86b
Fixing system locale dependent test
...
Signed-off-by: Stefan Schmidt <stefanschmidt@web.de>
2017-03-11 12:22:02 +01:00
Joakim Erdfelt
01d539e2be
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-09 14:20:19 -07:00
Joakim Erdfelt
1eeac2af6b
Fixing test
2017-03-09 14:17:05 -07:00
Greg Wilkins
9ea4f128d4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-09 15:59:58 +11:00
Joakim Erdfelt
6cf0663fe8
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-03-08 17:47:27 -07:00
Joakim Erdfelt
298de714f6
More windows build fixes
2017-03-08 15:29:54 -07:00
Joakim Erdfelt
f6b4b7b3e3
Issue #207 - Cleaning up Args vs Signature classes
2017-03-07 14:33:12 -07:00
Joakim Erdfelt
daf79bf4a9
Issue #207 - adding addMessageHandler(<lambda>) tests
2017-03-07 12:45:41 -07:00
Greg Wilkins
05f05520eb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-07 07:55:36 +11:00
Greg Wilkins
64c2529fb9
fixed merge
2017-03-06 15:00:14 +11:00
Greg Wilkins
0a2da4822d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-06 14:20:23 +11:00
Joakim Erdfelt
261f83f8cd
Issue #329 - Removing unused WS classes
2017-03-01 10:40:45 -07:00
Joakim Erdfelt
11b6e8ab49
Issue #609 - fixing testcase
2017-03-01 09:57:23 -07:00
Joakim Erdfelt
d34f126ecb
Issue #207 - Cannot catch PING in JSR356
2017-02-28 15:44:08 -07:00
Joakim Erdfelt
acf743fa6b
Issue #207 - Careful distinction between container policy, vs session policy
2017-02-28 13:05:29 -07:00
Joakim Erdfelt
0316e18f91
Issue #207 - working @PathParam support
2017-02-23 15:38:57 -07:00
Joakim Erdfelt
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
Joakim Erdfelt
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
Joakim Erdfelt
6adfa3c0a2
Fixing master tests (no longer need to specify Configuration)
2017-02-07 16:21:36 -07:00
Joakim Erdfelt
1338de9cfa
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-02-02 16:27:22 -07:00
Joakim Erdfelt
7f3ddf4edb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:26:43 -07:00
Joakim Erdfelt
35b94fffd3
Improving touchy timeouts on slow machines
2017-02-02 16:25:42 -07:00
Joakim Erdfelt
c5c7be2bc5
Merge branch 'jetty-9.4.x'
2017-02-02 16:23:13 -07:00
Joakim Erdfelt
5e57b9562f
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:14:10 -07:00
Joakim Erdfelt
9a8f22d5dd
Testing Updates
...
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
in jetty-test-helper and the test classes.
2017-02-02 15:51:38 -07:00
Jesse McConnell
e695fc80d6
Updating to version 9.2.22-SNAPSHOT
2017-01-20 12:32:51 -06:00
Jesse McConnell
513b5e5f90
Updating to version 9.2.21.v20170120
2017-01-20 12:32:00 -06:00
Jesse McConnell
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
Jesse McConnell
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -06:00
Jesse McConnell
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
Jesse McConnell
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06:00
Simone Bordet
84b57c5f07
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-20 12:32:18 +01:00
Simone Bordet
ee17396cee
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-20 12:27:29 +01:00
Simone Bordet
9ae93c19ca
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-01-20 12:20:21 +01:00
Simone Bordet
51f68dc57e
Issue #1229 - ClassLoader constraint issue when using NativeWebSocketConfiguration with WEB-INF/lib/jetty-http.jar present.
...
Introduced String-based APIs to specify mappings, to avoid the
classloader issue.
2017-01-20 11:34:29 +01:00
Simone Bordet
a205fb3aae
Fixes #1276 - Remove org.eclipse.jetty.websocket.server.WebSocketServerFactory from SPI.
2017-01-20 09:55:01 +01:00
Simone Bordet
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
Simone Bordet
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
Simone Bordet
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
Simone Bordet
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd
, reversing
changes made to 4565c186d7
.
2017-01-19 18:26:43 +01:00
Jesse McConnell
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
Jesse McConnell
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
Simone Bordet
b7b3dfdc77
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-12 17:53:09 +01:00
Simone Bordet
11d669092a
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
Greg Wilkins
611e79945c
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-11 18:10:50 +11:00
Joakim Erdfelt
7e3d3604ac
Merge pull request #1219 from violetagg/ws-suspend-resume
...
Issue #1218 - When resuming a suspended connection do not register a …
2017-01-10 17:24:12 -04:00
Joakim Erdfelt
487748cd8f
Issue #1207 - Making EventDriver use WebSocketContainerScope instead
2017-01-10 16:27:49 +01:00
Joakim Erdfelt
25a1864de7
Issue #1229 - Adding testcase for WAR (expanded) with WEB-INF/lib/jetty-http.jar
2017-01-10 11:12:14 -04:00
Simone Bordet
a51f800054
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-10 15:07:26 +01:00
Violeta Georgieva
eaa51be083
Issue #1218 - When resuming a suspended connection do not register a read interest if currently in filling mode.
...
Signed-off-by: Violeta Georgieva <vgeorgieva@pivotal.io>
2017-01-05 14:58:06 +02:00
Joakim Erdfelt
0fc897233a
Fixes #1216 to prevent duplicate SCI initialization of WSUF
2017-01-04 11:30:19 -04:00
Joakim Erdfelt
9324971d20
Issue #1216 improving init/destroy in WSUF
2017-01-04 10:42:51 -04:00
Joakim Erdfelt
ecc3c57dd1
Issue #1214 - Ensure all response headers are present
2017-01-04 10:10:23 -04:00
Simone Bordet
755de58ab6
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-03 11:01:05 +01:00
Joakim Erdfelt
cb7ef89619
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-27 14:07:29 -07:00
Joakim Erdfelt
bf80d822c0
Issue #1202 - Adding testcase and fix for NPE in Sec-WebSocket-Extensions use
2016-12-27 14:06:33 -07:00
Joakim Erdfelt
f3c4424722
Fixes #1197 - Copying headers into upgrade facade more consistently
2016-12-27 13:41:45 -07:00
Joakim Erdfelt
bfc21f23e0
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-27 13:33:41 -07:00
Joakim Erdfelt
03a283235c
Issue #1197 - adding testcase for Authorization use in WSClient
2016-12-27 13:32:21 -07:00
Joakim Erdfelt
77c63a1648
Merge branch 'release-9.3.15' into jetty-9.3.x
2016-12-21 14:56:08 -07:00
Joakim Erdfelt
243c24338f
Merge branch 'jetty-9.4.x'
2016-12-20 15:38:51 -07:00
Joakim Erdfelt
64f714689e
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-20 15:38:36 -07:00
Joakim Erdfelt
b9fd70f5ad
Bumping up test timeouts
2016-12-20 14:31:56 -07:00
Joakim Erdfelt
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
Joakim Erdfelt
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
Simone Bordet
d3ce624d9a
Merged branch 'jetty-9.4.x' into 'master'.
2016-12-17 18:38:52 +01:00
Joakim Erdfelt
6b3b59df43
Updating to version 9.2.21-SNAPSHOT
2016-12-16 16:23:06 -07:00
Joakim Erdfelt
bcbcee7f23
Updating to version 9.2.20.v20161216
2016-12-16 15:47:41 -07:00
Joakim Erdfelt
1441a1495b
Fixes #1138 - Adding jetty-client dependency to websocket.mod
2016-12-16 09:27:56 -07:00
Joakim Erdfelt
1c16964118
Merge branch 'jetty-9.4.x'
2016-12-16 08:38:16 -07:00
Joakim Erdfelt
44596a7714
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-16 08:38:01 -07:00
Joakim Erdfelt
c698c95e9b
Issue #1114 - removing redundant exportConfiguration
2016-12-15 10:44:34 -07:00
Joakim Erdfelt
bd104d59f9
Issue #1114 - persisting NativeWebSocketConfiguration mappings
...
+ Mappings are persisted if added to the NativeWebSocketConfiguration
before that configuration is started. Otherwise they are cleared
out on configuration.stop() lifecycle (like before)
2016-12-14 15:31:23 -07:00
Joakim Erdfelt
05f397caa4
Issue #1114 - Adding initial stop/start test logic
2016-12-14 13:20:28 -07:00
Simone Bordet
b6c4e5b7c9
Merged branch 'jetty-9.4.x' into 'master'.
2016-12-14 11:53:48 +01:00
Simone Bordet
dd3a73e57a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-12-14 11:19:49 +01:00
Joakim Erdfelt
9b609e0f6d
Issue #1161 - Leaving CookieStore alone HttpClient and WebSocketClient are stopped
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-12-14 09:00:12 +01:00
Jesse McConnell
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
Jesse McConnell
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
Jesse McConnell
19333b8b3b
Merge branch 'jetty-9.4.x' into release-9.4.0
2016-12-08 08:50:15 -06:00
Jan Bartel
8ea15f4214
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-08 20:17:20 +11:00
Greg Wilkins
5186c1e6d0
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-12-08 18:35:40 +11:00
Ben Duffield
c7e139a8a6
fix typo in PathParamServerEndpointConfig javadoc ( #1145 )
...
Signed-off-by: Ben Duffield <bduffield@palantir.com>
2016-12-08 18:08:06 +11:00
Jan Bartel
fe493c2c06
Issue #1124
...
Fix classloading of WebSocketServerFactory for osgi.
2016-12-08 17:25:18 +11:00
Jan Bartel
c02dec5654
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-08 11:31:00 +11:00
Jesse McConnell
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
Jesse McConnell
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
Greg Wilkins
a4884f0c2d
Issue #117
...
Fixed Upgrade Response to make a distinction between when headers are available from a response and when they are copied to and copied from the real response.
This exposed the fact that the extension header was being set twice. Fixed that and now test webapp works again.
2016-12-05 17:43:47 +11:00
Jan Bartel
936fd09a18
Issue #1124
...
Fix classloading of WebSocketServerFactory for osgi.
2016-12-05 09:42:44 +11:00
Jesse McConnell
2bb88f566f
Merge branch 'jetty-9.4.x'
2016-12-02 15:50:52 -06:00
Greg Wilkins
d7aa079365
Issue #117 fixed javadoc errors
2016-12-02 15:33:30 +11:00
Greg Wilkins
4b82f54ad3
Issue #117 fixed javadoc errors
2016-12-02 14:34:37 +11:00
Greg Wilkins
4046ef26d3
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-02 13:35:16 +11:00
Joakim Erdfelt
b70101b93f
Fixes #117 - working build of WebSocketClient with HttpClient
...
+ Proxy support exists now
2016-12-01 15:00:41 -07:00
Joakim Erdfelt
709938e02b
Merge branch 'issue-117' into jetty-9.4.x
2016-12-01 13:06:08 -07:00
Jan Bartel
4d7a629e1b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-01 12:07:07 +11:00
Joakim Erdfelt
47fd7e1bd2
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-30 14:41:43 -07:00
Joakim Erdfelt
4b5e5566e8
Issue #117 - minor code review changes
2016-11-30 10:50:05 -07:00
Joakim Erdfelt
63d93160f1
Issue #1124 - post review cleanup of changes with @sbordet
2016-11-30 10:16:25 -07:00
Joakim Erdfelt
70247d74d9
Issue #1124 - Fixing up merge issues
...
+ Making WebSocketServletFactory always load a new
WebSocketServerFactory
+ Making WebSocketServerFactory need a ServletContext
to construct it, if appropriate (the WebSocketHandler
approach doesn't use a ServletContext)
+ NativeWebSocketConfiguration is now a bean of
ServerContainer
+ Removed WebSocketServletFactory.init(ServletContext) method
+ Renamed WebSocketServletFactory.init() to .start()
+ Renamed WebSocketServletFactory.cleanup() to .stop()
+ CDI & Websocket now works
+ Using a ServletContextListener now works
+ DecoderFactory and EncoderFactory now work
2016-11-29 15:46:03 -07:00
Joakim Erdfelt
f54938178e
Merge branch 'jetty-9.2.x' into 'jetty-9.3.x'
2016-11-29 14:29:33 -07:00
Joakim Erdfelt
e329e386f0
Issue #117 - Carrying over the work from features/wsclient-httpclient
2016-11-28 15:45:38 -07:00
Joakim Erdfelt
c509a83d3b
Issue #1124 - adding more web.xml test cases
2016-11-25 07:38:20 -07:00
Simone Bordet
fb509eefe4
Resetting the field that marks the filter exported as a context attribute.
2016-11-25 15:10:32 +01:00
Joakim Erdfelt
a3f32911fa
Issue #1124 - WebSocketUpgradeFilter + ServletContextListener
...
+ Now Spring and its initialization of WebSocketUpgradeFilter
can work.
+ Improves life for cometd 3.1.0 as well
2016-11-23 19:55:36 -07:00
Simone Bordet
23753759bb
Merged branch 'jetty-9.4.x' into 'master'.
2016-11-23 12:19:31 +01:00
Simone Bordet
c5c0cc71d0
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-11-23 12:18:29 +01:00
Simone Bordet
a9817d7ac2
Fixes #1123 - Broken lifecycle for WebSocket's mappings.
...
Now resetting the mappings in the lifecycle callbacks of the
enclosing classes.
2016-11-23 12:14:01 +01:00
Greg Wilkins
2ef23a6725
Issue #572
...
Improved to the toString and dump output of connections, endpoints and channel to assist with debugging
made the SSL callbacks and runnables Invocable to avoid thread starvation.
2016-11-23 16:58:35 +11:00
Joakim Erdfelt
d361786e43
Issue #1118 - Eliminating .destroy() conflict
...
+ extending from AbstractLifeCycle instead of ContainerLifeCycle
2016-11-22 09:48:01 -07:00
Greg Wilkins
bf3ea9ae44
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-18 11:19:40 +11:00
Joakim Erdfelt
1003969468
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-17 11:04:40 -07:00