d10de87e09
Issue #207 - javax.websocket.DeploymentException thrown at addEndpoint now
2017-06-26 11:31:32 -07:00
3a37386ae9
Issue #207 - Using connection idle-timeout declared in annotation
2017-06-26 11:31:31 -07:00
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
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
43ef087efd
Issue #207 - Support javax.websocket version 1.1
...
+ Correcting tests
2017-06-26 11:29:12 -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
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
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
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
df584babc0
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:22:41 -07:00
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
53c9435183
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:20:14 -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
357fae18ae
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:19:02 -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
c8ffaec032
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:18:58 -07:00
c5954fc5d6
Trailing merge fixes
2017-06-26 11:18:57 -07:00
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
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
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
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
9acd03f0d9
Issue #207 - Support javax.websocket version 1.1
...
WIP
2017-06-26 10:55:20 -07:00
0a6fd16b52
Issue #207 - Support javax.websocket version 1.1
...
WIP
2017-06-26 10:55:18 -07:00
cbf8c971aa
467246 - Support javax.websocket version 1.1
...
WIP
2017-06-26 10:55:17 -07:00
3906f9595f
467246 - Support javax.websocket version 1.1
...
+ WIP
2017-06-26 10:55:04 -07:00
005ecbd704
More websocket test fixes
2017-06-21 14:10:08 -07:00
31705767f0
Enabling more websocket tests
2017-06-21 07:56:48 -07:00
4f2c31867e
Turning down logging level
2017-06-20 13:43:21 -07:00
d7483934a0
Correcting dumps to only occur during DEBUG
2017-06-20 13:42:53 -07:00
157fc4140b
Fixing WebSocket MessageReceivingTest
2017-06-20 13:40:30 -07:00
d0513ecbe6
Restoring JSR356 Session.setMax*MessageBufferSize() spec behavior
2017-06-20 13:40:05 -07:00
b7959456fb
Removing bad log silencing technique
2017-06-20 13:39:27 -07:00
03afcc8487
Hightlighting double-close issue better in logs
2017-06-20 09:55:48 -07:00
8d18118688
Reader-Self not relevant, removing
2017-06-20 09:55:21 -07:00
5638f7b25b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-16 14:33:01 -07:00
9e0fd7faa0
Issue #1625 - Support new IANA declared websocket close status codes
2017-06-16 14:23:29 -07:00
d8775c77d9
Issue #1616 - Making test more reliable
2017-06-15 13:36:03 -07:00
c496dd7961
Testing / UntrustedWSServer improvements
2017-06-15 13:35:40 -07:00
e1ebcdaf18
Correcting error message
2017-06-15 13:34:17 -07:00
fc15da79d4
Issue #1616 enabling debug output for CI testing
2017-06-14 16:19:44 -07:00
08962366ee
Disabling test in master
2017-06-14 16:18:18 -07:00
d02a14eeed
WebSocket SuspendResume updated tests and notes from review
2017-06-14 11:14:59 -07:00
7786d0fc2b
WebSocket Client sending Close/ProtocolError should also see onError
2017-06-14 10:01:01 -07:00
b31de636b4
Squelching Stacktraces
2017-06-14 08:43:10 -07:00
272679b39c
Reviewing more @Ignore'd WebSocket tests
2017-06-13 14:23:09 -07:00
00beb607fc
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-13 10:40:02 -07:00
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
67022482e5
Issue #1605 - common executor and bufferpool for jsr356 client
2017-06-12 09:23:23 -07:00
76ace004b6
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-09 09:17:43 -07:00
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
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
064c1bc39a
Issue #1604 - WebSocketContainer stop is now smarter
2017-06-07 11:48:36 -07:00
c1143fcc90
Issue #1603 - fixing NPE in WebSocketServerFactory init
2017-06-07 09:56:58 -07:00
0e5af3cc28
Reduce testing noise
2017-06-06 14:48:38 -07:00
ccea772fc3
Disabling problematic test temporarily
2017-06-06 08:42:44 -07:00
ad76aa6c65
Issue #1503 Optionally strip IPv6. Default true
2017-06-06 17:07:14 +02:00
059aa3cbe0
Adding more leniency on connection fault tests
2017-06-05 16:24:53 -07:00
88106fd355
WebSocket test fix
2017-06-05 14:26:53 -07:00
bc0fd4e1ef
No more websocket test errors (need to work on issues)
2017-06-05 14:16:48 -07:00
f98b4bd087
Fixing javadoc error
2017-06-05 11:16:45 -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
3e83908c58
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-06-05 10:02:01 -07:00
99fbc30f92
Issue #207 - Close Handshake Test refactor
2017-06-05 09:48:07 -07:00
b953f8d2d0
Merged branch 'jetty-9.4.x' into 'master'.
2017-06-05 18:07:51 +02:00
6a3c40e935
Updating to version 9.4.7-SNAPSHOT
2017-05-31 17:26:34 -07:00
8ba0f2d95d
Updating to version 9.4.6.v20170531
2017-05-31 16:22:52 -07:00
0f98e607e8
Issue #1514 - fixing bad websocket dump output
2017-05-31 13:36:27 -07:00
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
79b822339c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-31 06:18:40 -07:00
32bc9292a2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-31 11:56:47 +02:00
355f4ed7f3
Removing redundant new URI
2017-05-30 12:16:10 -07:00
ae496051de
Fixing confusing wss -> https case
2017-05-30 12:15:01 -07:00
ab4d300ae7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-30 17:43:19 +02:00
50500ac99d
Issue #1568 handle query strings with encoded characters
2017-05-24 23:03:22 +02:00
78280d0595
Issue #1568 handle query strings with encoded characters
2017-05-24 09:22:16 +02:00
4731470188
Issue #1568 - fixing accidental NPE with no query
2017-05-23 11:59:39 -07:00
296050dfc4
Issue #1568 - Fixing improper query encoding in WebSocket ServletUpgradeRequest
2017-05-23 10:32:22 -07:00
d3e50f8f80
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-22 23:37:51 +02:00
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
e001fe0355
Issue #1528 - pull preconfigured HttpClient from attributes
...
+ Search ServletContext attributes first
+ Search Server attributes next
2017-05-19 08:27:53 -07:00
7b2a0e380d
Using ThreadClassLoaderScope
2017-05-18 16:13:16 -07:00
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
9b4bfbc680
Issue #1544 - Identifying context that JSR-356 was disabled for in configuration
2017-05-18 14:03:16 -07:00
1ba61e8e0c
Issue #207 - removing scheduler
2017-05-15 13:38:45 -07:00
4e2f6265eb
Issue #207 - stabilizing testcase
2017-05-15 13:16:54 -07:00
77252270ff
Post-merge cleanup
2017-05-15 10:06:47 -07:00
04b6afe879
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-05-15 09:48:41 -07:00
873c3554e7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-12 14:06:21 -07:00
016cbfa5f4
Issue #207 - UntrustedWSServlet should have a slightly higher then default max message size
2017-05-11 13:26:03 -07:00
2ed56d4142
Issue #207 - Improved testing reliability
2017-05-11 13:20:31 -07:00
5701de4fd8
Issue #207 - Improved Close notification and testing
2017-05-11 11:07:41 -07:00
92741b2116
Issue #207 - Adding toString()
2017-05-11 10:59:32 -07:00
6cfcbeffad
Issue #207 - Identify non-echo client endpoint options for testing
2017-05-11 10:59:16 -07:00
e84e875e14
Issue #207 - Change in test expectation
2017-05-11 10:57:31 -07:00
c75e3c19d9
Issue #1516 - making WebSocket started thread pools have identifying names
2017-05-11 09:52:02 -07:00
b1f8f492b9
Issue #207 - better client connect/upgrade error handling
2017-05-11 07:06:18 -07:00
500ae69409
Issue #207 - stabilizing testing of Dispatched MessageSinks
2017-05-11 06:05:37 -07:00
cbe857de01
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-11 10:08:36 +02:00
27f03dbc25
Issue #207 - test compilation fix
2017-05-10 18:12:31 -07:00
2043a923cf
Issue #207 - All websocket tests moved to /websocket-tests/ module
2017-05-10 16:56:03 -07:00
2679715a30
Silencing bogus JSR356 IdleTimeoutTest warning
2017-05-10 12:13:24 -07:00
427408c251
JSR356 ClientContainer testing fix
2017-05-10 09:48:51 -07:00
a7b164e6b9
Fixing JSR356 Client tests
2017-05-10 07:46:56 -07:00
f1a89ce3b2
Issue #207 - MessageOutputStream fix
2017-05-09 17:17:07 -07:00
869ccf4421
Issue #207 - javadoc fix
2017-05-09 15:27:15 -07:00
753ed9e603
Issue #1516 - Delay starting of WebSocketClient
2017-05-09 12:58:22 -07:00
4bae04b623
Issue #207 - cleaning up dispatched MessageSink threading
2017-05-09 12:20:46 -07:00
d0c7f822f7
Issue #207 - CommonEndpointFunctionsTest needs started WebSocketContainerScope
2017-05-08 07:18:58 -07:00
546ccf5814
Issue #207 - testing JsrSessionTest needs started ClientContainer
2017-05-08 07:16:36 -07:00
d1281565ff
Issue #207 - testing JsrEndpointFunctions need started ClientContainer
2017-05-08 07:15:03 -07:00
b73b531d62
Issue #207 - Restoring fillAndParse callback
2017-05-08 05:19:11 -07:00
55e435c741
Issue #207 - more test fixes
2017-05-05 12:37:44 -07:00
3b31ecc2b1
Issue #207 - more test induced fixes
2017-05-04 13:37:29 -07:00
c2626cf1f2
Issue #207 - More test fixes
2017-05-03 16:59:54 -07:00
e36ffe1f86
Issue #207 - more testing updates and mainline code fixes
2017-05-02 17:06:53 -07:00
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
89f76e0037
Issue #207 - simplifying OnUpgradeTo prefill + parse, with test
2017-04-28 17:11:56 -07:00
e200f66ded
Issue #207 - removing ignoreBrokenPipe
2017-04-28 13:18:13 -07:00
a2a2aac6ad
Issue #207 - websocket-client test cleanup
2017-04-28 13:17:04 -07:00
94182b7134
Issue #207 - common test cleanup
2017-04-28 13:16:43 -07:00
081663e522
Issue #207 - more test fixes
2017-04-28 09:41:58 -07:00
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
56fac5fdb1
Issue #207 - more test failure fixes
2017-04-27 16:26:32 -07:00
d216206fcd
Issue #207 - Adding missing JSR356 Server @PathParam ArgIdentifier
2017-04-27 13:18:14 -07:00
ae51344582
Issue #207 - Final removal of BlockheadClient
2017-04-27 11:21:04 -07:00
7f345fc2d4
Issue #207 - Removing BlockheadServer
2017-04-26 18:25:06 -07:00
641d051e97
Issue #207 - moved some JSR356 tests to websocket-tests
2017-04-26 18:13:56 -07:00
e276705948
Issue #207 - moved client tests to websocket-tests
2017-04-26 16:01:07 -07:00
0195812f18
Disabling more flaky tests that are fixed in issue-207 branch
2017-04-26 11:34:57 -07:00
240b82be70
Disabling currently flaky tests that are fixed in issue-207 branch
2017-04-26 08:45:59 -07:00
ee6d495af4
Issue #207 - fixing javadoc
2017-04-25 12:41:16 -07:00
4c5dd93b30
Issue #1502 - Changing WSUF target creation used by PathMappings match
2017-04-24 16:08:37 -07:00
38e0976513
Issue #207 - allowing untrusted sessions to have non-validating generators
2017-04-21 17:21:47 -07:00
6e797f5e7d
Issue #207 - websocket-common test fixes
2017-04-21 16:39:27 -07:00
683509be60
Issue #207 - more review rework
2017-04-21 16:21:07 -07:00
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
849ad7c917
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-04-21 09:00:54 -07:00
ce9cd8d168
Issue #207 - more testing updates
2017-04-21 09:00:30 -07:00
ca2423985c
tidy up close
2017-04-21 17:14:26 +10:00
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
92ea5bda21
Updating to version 9.4.5-SNAPSHOT
2017-04-14 14:43:36 -07:00
3dc8f557c6
Updating to version 9.4.4.v20170414
2017-04-14 13:20:17 -07:00
7e2e64e856
Issue #207 - testcase rework due to new async behaviors
2017-04-11 15:46:47 -07:00
d2d5c0e4a4
Issue #207 - improve port handling in URI conversions
2017-04-11 09:11:53 -07:00
9620d5c5e8
Issue #207 - ongoing testing improvements
2017-04-07 16:24:12 -07:00
2d01d1431a
Issue #207 - fixing compilation error
2017-04-07 14:34:35 -07:00
9199ec8843
Issue #207 - Improved Error Handling
2017-04-07 14:30:15 -07:00
c59afd70f0
Issue #207 - remove IncomingFrames#incomingError(throwable)
2017-04-07 13:20:50 -07:00
9adbf2b361
Issue #207 - more work on policy / buffer behaviors
2017-04-07 12:03:05 -07:00
73ca336014
Issue #207 - reworking I/O to allow streaming backpressure
2017-04-06 15:58:35 -07:00
f2c09d5388
Issue #207 - removing unused section
2017-04-06 12:23:59 -07:00
893b153cb3
Issue #207 - initial pass through for Stream backpressure
2017-04-05 17:30:51 -07:00
dd084b4e74
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-30 17:20:22 +11:00
b8ddef08d6
Merge remote-tracking branch 'origin/release-9.4.3' into jetty-9.4.x
2017-03-22 09:31:44 -07:00
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
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
9273d99a99
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-03-15 15:07:17 -07:00
ab5e94f86b
Fixing system locale dependent test
...
Signed-off-by: Stefan Schmidt <stefanschmidt@web.de>
2017-03-11 12:22:02 +01:00
01d539e2be
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-09 14:20:19 -07:00
1eeac2af6b
Fixing test
2017-03-09 14:17:05 -07:00
9ea4f128d4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-09 15:59:58 +11:00
6cf0663fe8
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-03-08 17:47:27 -07:00
298de714f6
More windows build fixes
2017-03-08 15:29:54 -07:00
f6b4b7b3e3
Issue #207 - Cleaning up Args vs Signature classes
2017-03-07 14:33:12 -07:00
daf79bf4a9
Issue #207 - adding addMessageHandler(<lambda>) tests
2017-03-07 12:45:41 -07:00
05f05520eb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-07 07:55:36 +11:00
64c2529fb9
fixed merge
2017-03-06 15:00:14 +11:00
0a2da4822d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-06 14:20:23 +11:00
261f83f8cd
Issue #329 - Removing unused WS classes
2017-03-01 10:40:45 -07:00
11b6e8ab49
Issue #609 - fixing testcase
2017-03-01 09:57:23 -07:00
d34f126ecb
Issue #207 - Cannot catch PING in JSR356
2017-02-28 15:44:08 -07:00
acf743fa6b
Issue #207 - Careful distinction between container policy, vs session policy
2017-02-28 13:05:29 -07:00
0316e18f91
Issue #207 - working @PathParam support
2017-02-23 15:38:57 -07:00
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
6adfa3c0a2
Fixing master tests (no longer need to specify Configuration)
2017-02-07 16:21:36 -07:00
1338de9cfa
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-02-02 16:27:22 -07:00
7f3ddf4edb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:26:43 -07:00
35b94fffd3
Improving touchy timeouts on slow machines
2017-02-02 16:25:42 -07:00
c5c7be2bc5
Merge branch 'jetty-9.4.x'
2017-02-02 16:23:13 -07:00
5e57b9562f
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:14:10 -07:00
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
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -06:00
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06:00
84b57c5f07
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-20 12:32:18 +01:00
ee17396cee
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-20 12:27:29 +01:00
9ae93c19ca
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-01-20 12:20:21 +01:00
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
a205fb3aae
Fixes #1276 - Remove org.eclipse.jetty.websocket.server.WebSocketServerFactory from SPI.
2017-01-20 09:55:01 +01:00
Joakim Erdfelt
Greg Wilkins
Simone Bordet
dreis2211
Stefan Schmidt
Jesse McConnell