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
9e0fd7faa0
Issue #1625 - Support new IANA declared websocket close status codes
2017-06-16 14:23:29 -07:00
67022482e5
Issue #1605 - common executor and bufferpool for jsr356 client
2017-06-12 09:23:23 -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
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
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
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
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
c75e3c19d9
Issue #1516 - making WebSocket started thread pools have identifying names
2017-05-11 09:52:02 -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
753ed9e603
Issue #1516 - Delay starting of WebSocketClient
2017-05-09 12:58:22 -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
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
4c5dd93b30
Issue #1502 - Changing WSUF target creation used by PathMappings match
2017-04-24 16:08:37 -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
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
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
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
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
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
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
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
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
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd4565c186d7
2017-01-19 18:26:43 +01:00
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
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
611e79945c
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-11 18:10:50 +11:00
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
487748cd8f
Issue #1207 - Making EventDriver use WebSocketContainerScope instead
2017-01-10 16:27:49 +01:00
25a1864de7
Issue #1229 - Adding testcase for WAR (expanded) with WEB-INF/lib/jetty-http.jar
2017-01-10 11:12:14 -04:00
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
0fc897233a
Fixes #1216 to prevent duplicate SCI initialization of WSUF
2017-01-04 11:30:19 -04:00
9324971d20
Issue #1216 improving init/destroy in WSUF
2017-01-04 10:42:51 -04:00
ecc3c57dd1
Issue #1214 - Ensure all response headers are present
2017-01-04 10:10:23 -04:00
cb7ef89619
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-27 14:07:29 -07:00
bf80d822c0
Issue #1202 - Adding testcase and fix for NPE in Sec-WebSocket-Extensions use
2016-12-27 14:06:33 -07:00
f3c4424722
Fixes #1197 - Copying headers into upgrade facade more consistently
2016-12-27 13:41:45 -07:00
bfc21f23e0
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-27 13:33:41 -07:00
03a283235c
Issue #1197 - adding testcase for Authorization use in WSClient
2016-12-27 13:32:21 -07:00
77c63a1648
Merge branch 'release-9.3.15' into jetty-9.3.x
2016-12-21 14:56:08 -07:00
64f714689e
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-20 15:38:36 -07:00
b9fd70f5ad
Bumping up test timeouts
2016-12-20 14:31:56 -07:00
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
6b3b59df43
Updating to version 9.2.21-SNAPSHOT
2016-12-16 16:23:06 -07:00
bcbcee7f23
Updating to version 9.2.20.v20161216
2016-12-16 15:47:41 -07:00
1441a1495b
Fixes #1138 - Adding jetty-client dependency to websocket.mod
2016-12-16 09:27:56 -07:00
44596a7714
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-16 08:38:01 -07:00
c698c95e9b
Issue #1114 - removing redundant exportConfiguration
2016-12-15 10:44:34 -07:00
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
05f397caa4
Issue #1114 - Adding initial stop/start test logic
2016-12-14 13:20:28 -07:00
dd3a73e57a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-12-14 11:19:49 +01:00
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
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
19333b8b3b
Merge branch 'jetty-9.4.x' into release-9.4.0
2016-12-08 08:50:15 -06:00
5186c1e6d0
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-12-08 18:35:40 +11:00
c7e139a8a6
fix typo in PathParamServerEndpointConfig javadoc ( #1145 )
...
Signed-off-by: Ben Duffield <bduffield@palantir.com>
2016-12-08 18:08:06 +11:00
fe493c2c06
Issue #1124
...
Fix classloading of WebSocketServerFactory for osgi.
2016-12-08 17:25:18 +11:00
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
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
936fd09a18
Issue #1124
...
Fix classloading of WebSocketServerFactory for osgi.
2016-12-05 09:42:44 +11:00
d7aa079365
Issue #117 fixed javadoc errors
2016-12-02 15:33:30 +11:00
4b82f54ad3
Issue #117 fixed javadoc errors
2016-12-02 14:34:37 +11:00
b70101b93f
Fixes #117 - working build of WebSocketClient with HttpClient
...
+ Proxy support exists now
2016-12-01 15:00:41 -07:00
709938e02b
Merge branch 'issue-117' into jetty-9.4.x
2016-12-01 13:06:08 -07:00
47fd7e1bd2
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-30 14:41:43 -07:00
4b5e5566e8
Issue #117 - minor code review changes
2016-11-30 10:50:05 -07:00
63d93160f1
Issue #1124 - post review cleanup of changes with @sbordet
2016-11-30 10:16:25 -07:00
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
f54938178e
Merge branch 'jetty-9.2.x' into 'jetty-9.3.x'
2016-11-29 14:29:33 -07:00
e329e386f0
Issue #117 - Carrying over the work from features/wsclient-httpclient
2016-11-28 15:45:38 -07:00
c509a83d3b
Issue #1124 - adding more web.xml test cases
2016-11-25 07:38:20 -07:00
fb509eefe4
Resetting the field that marks the filter exported as a context attribute.
2016-11-25 15:10:32 +01:00
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
c5c0cc71d0
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-11-23 12:18:29 +01:00
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
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
d361786e43
Issue #1118 - Eliminating .destroy() conflict
...
+ extending from AbstractLifeCycle instead of ContainerLifeCycle
2016-11-22 09:48:01 -07:00
1003969468
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-17 11:04:40 -07:00
7930a3dac8
Fixing merge 9.2.x -> 9.3.x
2016-11-16 18:31:33 -07:00
bfadca49b5
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-11-16 13:56:31 -07:00
e6b3216708
Issue #1090 - Delaying role of WebSocketUpgradeFilter till .init()
...
+ WebSocketServerContainerInitializer now initializes the
MappedWebSocketCreator, WebSocketServerFactory, and
ServerContainer directly, but puts the components needed
by WebSocketUpgradeFilter into ServletContext attributes
that it can obtain in its own init()
+ Added optional org.eclipse.jetty.websocket.jsr356.addDynamicFilter
init-param/attribute key to disable/enable the automatic addition
of the WebSocketUpgradeFilter during JSR356 init (to allow
WEB-INF/web.xml specified filter to operate instead)
+ Added WebSocketServerContainerINitializer.isEnabledViaContext()
to make testing the init-param and attributes more generic
2016-11-16 13:43:06 -07:00
Joakim Erdfelt
Greg Wilkins
dreis2211
Stefan Schmidt
Jesse McConnell
Simone Bordet
Violeta Georgieva
Ben Duffield
Jan Bartel