ecb3ab7e5b
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2014-07-23 16:38:15 +10:00
31359b1775
ignore failing tests
2014-07-23 15:23:35 +10:00
853e020210
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-16 15:31:48 +10:00
745f757552
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-07-15 18:49:14 +02:00
fff2dd2f2d
misc test fixes for rfc7230 issues
2014-07-11 16:10:06 +10:00
5e281dd449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-07-10 14:43:39 +10:00
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
334db9fe72
Updated version to 9.3.0-SNAPSHOT.
2014-06-16 21:33:03 +02:00
adaeeefe32
Merged branch 'master' into 'jetty-http2'.
2014-06-16 16:08:40 +02:00
a41dd1caf5
436874 - WebSocket client throwing a NullPointer when handling a pong
...
+ Adding NPE guard for PONG with no payload.
2014-06-11 08:30:52 -07:00
c3ee0711ca
[maven-release-plugin] prepare for next development iteration
2014-06-09 13:37:54 -05:00
06b494eeac
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
2014-06-09 13:37:49 -05:00
10b6c574ae
Merge branch 'master' into release-9
2014-06-09 13:07:22 -05:00
bb4d42f139
Merge remote-tracking branch 'origin' into jetty-http2
2014-06-04 15:09:19 +02:00
8f4aeeeb8d
updated version to 10.0.0-SNAPSHOT
2014-06-04 15:08:54 +02:00
353b0f80c8
Enabling and fixing testcase
2014-05-29 11:39:36 -07:00
2e859e4ae2
[maven-release-plugin] prepare for next development iteration
2014-05-26 12:04:15 -05:00
71ad2114c5
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
2014-05-26 12:04:08 -05:00
d59dbe936b
[maven-release-plugin] prepare for next development iteration
2014-05-23 09:59:19 -05:00
edc7646a4c
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
2014-05-23 09:59:13 -05:00
f2ea8351b6
429390 - Decoders and Encoders are not registered for non-annotated ClientEndpoint
...
+ Adding EncoderTest to verify reported bug
+ Fixing SimpleEndpointMetadata to propagate the encoder/decoder list
when present.
2014-05-22 13:12:39 -07:00
900dea3719
433262 - WebSocket / Advanced close use cases
...
+ ClientCloseTest implementation of various outlined use cases.
2014-04-22 16:07:45 -07:00
c5e1e249e7
set version for 9.2.x
2014-03-31 11:35:06 +11:00
a85b855921
Revert ALPN and java 8 changes to move to another branch
...
Reverts e9ecd8c,2f22a10,addc49f,f4e4b09,cf1c245
Disabled unit test from commit 47e7583
2014-03-19 12:54:04 +11:00
47e7583ada
430088 - OnMessage*Callable decoding of streaming binary or text is not thread safe
...
+ Adding testcase for Decoder.TextStream and lots of short messages with
order indicator (for the order in which they were sent)
Test case validates that all of the messages were received, not that
they were in any particular order (as the use of Streaming prevents
reliable ordering)
+ Adding defensive copy of callable array in order to prevent any
possibility of concurrency issues with streams and dispatched
calls.
2014-03-17 15:05:55 -07:00
e1417861b9
430088 - OnMessageTextStreamCallable is not thread safe
...
+ Adding client side testcase for Decoder.TextStream use with a Reader
and multiple frames being received.
2014-03-14 13:46:47 -07:00
0ec0d452e9
[maven-release-plugin] prepare for next development iteration
2014-03-07 09:10:08 -06:00
1e555567a9
[maven-release-plugin] prepare release jetty-9.1.3.v20140225
2014-03-07 09:10:08 -06:00
a3e5e0858c
428595 - JSR-356 / ClientContainer does not support SSL
...
+ Default SslContextFactory initialized
+ Setting for trustAll configurable via System property
"org.eclipse.jetty.websocket.jsr356.ssl-trust-all"={bool}
2014-03-06 13:28:56 -07:00
6959d911d5
428597 javax-websocket-client-impl and javax-websocket-server-impl jars Manifests do not export packages for OSGI
2014-03-06 16:47:10 +11:00
f465a13d6d
428435 - Large streaming message fails in MessageWriter.
...
Fixed buffering, synchronization and callback notification in the
websocket stream implementation classes.
2014-02-24 14:28:10 +01:00
1ac6b82912
428232 - Rework batch mode / buffering in websocket.
...
Introduced the automatic batch mode, akin to Jetty 8's WebSocket
implementation.
Now, if there are no more frames to process, and the previous frames
have been aggregated, FrameFlusher auto-flushes the aggregated frames.
This simplifies applications because they don't need to call flush()
explicitly.
2014-02-18 18:31:49 +01:00
4bdca367dd
428232 - Rework batch mode / buffering in websocket.
...
Refactored FrameFlusher to handle aggregation of frames to support
JSR 356's batch mode.
Now FrameFlusher can aggregate frames as long as the FlushMode they
were sent is AUTO. When a frame that has FlushMode SEND arrives,
it will trigger the flush of the aggregate buffer (and eventually
also other queued frames).
A special BINARY frame is used to implement explicit flush()
invocations.
2014-02-18 18:31:48 +01:00
8e5c06b95c
428232 - Rework batch mode / buffering in websocket.
...
Refactored OutgoingFrames.outgoingFrame() to take an additional
parameter, FlushMode. This is in preparation for handling this new
parameter in FrameFlusher.
2014-02-18 18:31:48 +01:00
cff7c9dbcb
Cleaning up websocket connection open/close in favor of session open/close
2014-02-13 16:22:55 -07:00
eb0aea46ce
set versions.txt file to new version and fix mistaken developmentVersion
2014-02-10 13:48:29 -06:00
f3d38dfb15
[maven-release-plugin] prepare for next development iteration
2014-02-10 11:17:14 -06:00
8f6cbc9111
[maven-release-plugin] prepare release jetty-9.1.2.v20140210
2014-02-10 11:17:07 -06:00
5d9360e343
427254 - Cookies are not sent to the client.
...
Introduced ServletUpgradeResponse.complete(), called when the response
is about to be sent to the client, to transfer the headers stored in
the superclass (UpgradeResponse.headers) into the HttpServletResponse.
2014-02-03 15:31:51 +01:00
cfe248c67b
427128 - Cookies are not sent to the server.
...
Implemented/fixed handling of cookies sent by client to server.
2014-02-03 12:49:58 +01:00
5e3c8821bb
If ClientContainer is being stopped, then we can unregister it from
...
the ShutdownThread.
This happens when ClientContainer is added as a managed bean to a
ContainerLifeCycle and the container is stopped.
2014-02-03 12:09:27 +01:00
b82ec6e668
[maven-release-plugin] prepare for next development iteration
2014-01-08 16:47:09 -06:00
b99623a21d
[maven-release-plugin] prepare release jetty-9.1.1.v20140108
2014-01-08 16:47:01 -06:00
9df519c40f
423948 - Cleanup and consolidate testing utilities in WebSocket
...
+ Created websocket-common-tests.jar artifact
+ Consolidated duplicate code from other websocket-* modules
into the websocket-common test artifact
2014-01-08 10:47:45 -07:00
44a7d23516
423646 - WebSocket / JSR / WebSocketContainer (Client) should have its LifeCycle stop on standalone use
...
+ Set Daemon on Executor and Scheduler threads to allow them to shutdown
with the JVM
2014-01-07 13:08:10 -07:00
b59057c184
424863 - IllegalStateException "Unable to find decoder for type <javax.websocket.PongMessage>"
...
+ Expanding testing of PongMessage
+ Ensuring that .addMessage(MessageHandler.Whole<PongMessage>) works
+ Ensuring that ping or pong messages all goto assigned message
handler for PongMessage, for both extends Endpoint and
annotated @OnMessage
2014-01-06 17:54:57 -07:00
8016065823
424706 - The setMaxIdleTimeout of javax.websocket.Session does not take any affect
...
+ Making sure that JsrSession updates Connection on use of
setMaxIdleTimeout after a connection has been opened.
2014-01-06 15:07:02 -07:00
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
5cf9640cfa
423724 - WebSocket / Rename MessageAppender.appendMessage to .appendFrame
2013-12-20 13:22:01 -07:00
ab9040bb63
424497 - Allow concurrent async sends
2013-12-20 11:49:33 +11:00
9a20a534b5
423646 - WebSocket / JSR / WebSocketContainer (Client) should have its LifeCycle stop on standalone use
...
+ Not working (yet), but narrowed down the problem.
2013-12-18 05:51:24 -07:00
5941e9db83
Fixing various warnings / imports
2013-12-12 14:46:40 -07:00
bc7afdc172
423476 - WebSocket / JSR / @OnMessage(maxMessageSize=20000000) not properly supported
...
+ Correcting @OnMessage handling of max message size for TEXT/BINARY
from both @ClientEndpoint and @ServerEndpoint usage
+ Testcases to prevent regression.
2013-12-12 13:20:49 -07:00
120e0e59ca
Cleanup (Imports / StandardCharset / Dead APIs)
2013-12-11 17:27:58 -07:00
5bb1631c68
Removing conflicting javax.websocket:javax.websocket-client-api artifact
2013-12-11 17:00:28 -07:00
1eac013485
422192 - ClientContainer.getOpenSessions() always returns null
...
+ Adding SessionListener and using it judiciously
2013-12-04 12:24:48 -07:00
0a52c64d16
421697 - IteratingCallback improvements
...
Use the iteratingcallback for websocket
use gather writes for websocket
always write entire websocket payload
2013-11-21 15:11:56 +11:00
9172d6115b
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:58:44 -07:00
6feeab6ec3
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:58:36 -07:00
7bbc0ff4df
[maven-release-plugin] rollback the release of jetty-9.1.0.v20131115
2013-11-15 16:33:52 -07:00
1126e68971
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:03:28 -07:00
d6418c73d4
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:03:20 -07:00
6c372b9440
Reverting <version> to 9.1.0-SNAPSHOT
2013-11-15 15:36:26 -07:00
b5345caed1
[maven-release-plugin] prepare for next development iteration
2013-11-14 15:27:52 -06:00
1582aa196d
[maven-release-plugin] prepare release jetty-9.1.0.v20131114
2013-11-14 15:27:37 -06:00
63f20d4518
[maven-release-plugin] prepare for next development iteration
2013-11-07 10:42:54 -06:00
dc2fd1b9ce
[maven-release-plugin] prepare release jetty-9.1.0.RC2
2013-11-07 10:42:41 -06:00
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
6f1eb712e9
Cleaning up imports
2013-11-01 10:03:40 -07:00
a0ddb2c5d7
418632 - WebSocket / Jsr annotated @OnMessage with InputStream fails to be called
...
+ Fixed load order issue with binary vs text
+ Fixed decoder assignment for InputStream
+ Added unit tests to prevent regression of this feature
2013-10-03 16:07:49 -07:00
8d5013e15f
418625 - WebSocket / Jsr RemoteEndpoint.sendObject(java.nio.HeapByteBuffer) doesn't find encoder
...
+ Adding fallback lookup using isAssignable(type) if basic map based
lookup fails first. Remembers successful isAssignable(type) match
for future lookups via basic map approach.
2013-10-03 14:05:04 -07:00
b52d7f09b0
418068 WebSocketClient has lazy or injected Executor
2013-09-26 18:06:55 +10:00
7f85842666
417134 - WebSocket / Jsr ServerEndpointConfig.Configurator.getNegotiatedExtensions() is never used
...
+ Extensions pre-negotiated via
ServerEndpointConfig.Configurator.getNegotiatedExtensions are not
properly handled.
+ Added JsrBrowserDebugTool (Jsr version of BrowserDebugTool)
2013-09-12 15:25:02 -07:00
4b3541b7d1
WebSocket / making sure that filter always sees the correct target path, regardless of servlets
2013-09-11 08:56:19 -07:00
31ff31c8b1
Undo temporary change for memory testing reasons
2013-09-09 12:23:50 -07:00
aeac72a684
416812 - Don't start WebSocketClient for every context
...
+ Lazy initializing WebSocketClient connection manager
to avoid holding threads that the selector manager
will allocate.
2013-09-09 12:06:57 -07:00
b1b8e2b0a1
Adding Example for javax.websocket Client use
2013-09-09 10:08:58 -07:00
ed0f49f819
416763 - WebSocket / Jsr Session.getPathParameters() is empty
...
+ Adding support for `extends Endpoint` based endpoints as well
2013-09-06 14:35:22 -07:00
fe4a778334
416764 - WebSocket / Jsr Session.getRequestURI() is missing scheme + host + port + query parameters
...
+ Relying on WebSocketSession.getRequestURI() instead.
2013-09-06 13:57:05 -07:00
50d98ab527
416763 - WebSocket / Jsr Session.getPathParameters() is empty
...
+ Ensuring this works as intended with new test case
2013-09-06 13:40:49 -07:00
e4235ea070
415744 - Reduce Future usage in websocket
2013-08-23 19:58:46 +10:00
975d9870d2
WebSocket - more code cleanup
2013-08-20 16:28:51 -07:00
8c77fe2404
WebSocket - addressing bug in Partial message support
2013-08-20 15:31:12 -07:00
00d160a1c9
Merge branch 'release-9.1' into jetty-9.1
2013-08-14 14:37:19 -05:00
6daf39b10b
Fixing javadoc generation in jetty-all
...
+ Added missing javax artifacts to jetty-all pom
+ Moved javax.websocket versioning to top level pom
2013-08-14 12:14:47 -07:00
657e78aff2
[maven-release-plugin] prepare for next development iteration
2013-08-14 13:28:42 -05:00
590fae2bc4
[maven-release-plugin] prepare release jetty-9.1.0.M0
2013-08-14 13:28:32 -05:00
e39b48c90d
Fixing up javadoc issues in WebSocket classes
2013-08-14 10:54:07 -07:00
176c7d22e4
JSR-356 - adding missing base Encoders
2013-08-13 12:09:43 -07:00
eb0d7da7f2
JSR-356 Making PongMessage work with @OnMessage annotation
2013-08-06 13:15:13 -07:00
3e070f929e
JSR-356 addMessageHandler with Reader or InputStream should not NPE
2013-08-06 12:55:02 -07:00
ed95ffbfea
Fixed lifecycle management.
2013-08-02 15:05:50 +02:00
89b33f5b88
WebSocket - fixing message (buffer) size settings and checks
2013-08-01 16:06:44 -07:00
e2f02a7a8a
JSR-356 fixing ServerContainer.setDefault*() method behavior
2013-07-31 14:25:54 -07:00
9846aee917
JSR-356 returning empty string (per javadoc) instead of null for Session.getNegotiatedSubprotocol()
2013-07-31 11:42:42 -07:00
153c844238
Adding Shutdown hook to ClientContainer
2013-07-31 10:48:23 -07:00
0fd0ecc887
JSR-356 - making ClientContainer a use jetty LifeCycle properly
2013-07-31 10:34:31 -07:00
8a2ccdf8ae
JSR-356 - fixing Session.setMax(Text|Binary)MessageBufferSize
2013-07-31 09:52:51 -07:00
0833d66dc6
JSR-356 - unwrapping connect exceptions better
2013-07-31 08:15:32 -07:00
f8172e5a59
JSR-356 fixing calling of @OnMessage with partial message boolean
2013-07-30 14:27:48 -07:00
702b675e86
JSR-356 Fixing dispatching for Streaming reads
2013-07-30 12:49:04 -07:00
37feaea34b
JSR-356 adding support for javax.websocket.server.ServerApplicationConfig
2013-07-29 15:55:22 -07:00
b363400c84
JSR-356 - making SessionFactory additive to allow multiple impls at the same time.
2013-07-29 09:30:42 -07:00
6076e05bf6
JSR-356 fixing oddly worded exception
2013-07-26 14:04:17 -07:00
ca23911075
JSR-356 - Changing to ServerContainer access.
...
+ Using technique as outlined in JSR-356 spec, Section 6.4
2013-07-26 14:04:17 -07:00
d967dafe45
JSR-356 - Refactoring Annotated method parameter detection and use
2013-07-24 12:32:15 -07:00
e69b41e9cd
JSR-356 Adding suppport for @PathParam
2013-07-16 16:56:03 -07:00
fb00eb55cd
JSR-356 Promoting ReflectUtils to websocket-common
2013-07-16 10:43:27 -07:00
05c5342752
JSR-356 Improving MessageHandler manipulation
2013-07-15 16:00:02 -07:00
9a8580b580
JSR-356 Improving Debugging of Annotated EventDrivers
2013-07-15 15:59:22 -07:00
179a78e502
JSR-356 Promoting UpgradeRequest.getUserPrinicpal() to API
2013-07-15 11:49:30 -07:00
6bd2f8fd3e
JSR-356 - Fixing StackOverflowError on Session.getProtocolVersion()
2013-07-15 11:39:56 -07:00
2362a4e8b3
JSR-356 - Handling ClientContainer.setMax(Text|Binary)MessageBufferSize better
...
+ The Jetty API is more configurable than the JSR, this forces the
Jetty side API to be consistent for whatever value the end user
specifies.
2013-07-15 10:43:39 -07:00
b3aee8e4d5
JSR-356 - fixing NPE on Extension.getParameters()
2013-07-15 10:43:39 -07:00
5d45486b8d
JSR-356 - Cleaning up sendObject(Object) behavior between Basic & Async
2013-07-15 10:43:39 -07:00
ce37be598c
JSR-356 fixing Reader and Boolean parameter id detection.
2013-07-11 11:29:46 -07:00
495d2bcd74
JSR-356 - Fixing @OnMessage message format/decoder detection
2013-07-11 11:00:23 -07:00
022b8d4a12
JSR-356 - adding more examples of using Primitives for @OnMessage
2013-07-10 16:35:50 -07:00
5bb66f028a
Dialing back the logging level
2013-07-10 11:53:14 -07:00
33c11dffaa
JSR-356 - cleaning up Decoder and Encoder lifecycle.
2013-07-09 14:16:06 -07:00
46e9493c85
JSR-356 - reworked Config to maintain user provided config
...
+ If a user provided config is supplied, then that config should
be used for init(EndpointConfig) and other various accesses to
the configuration object. This refactor stops using an internal
EndpointConfig object always and moves the internal config
fields into the JsrSession object instead.
2013-07-09 14:16:06 -07:00
0cf6977a35
JSR-356 - fixing reflected detection of interface generic class type.
...
+ Used by Decoders, Encoders, and MessageHandlers
2013-06-27 09:28:02 -07:00
9959bbd946
JSR-356 - allow WebSocketContainer.connectToServer(Class<?>, URI) to work with classes that extend Endpoint (not just annotated classes)
2013-06-20 12:11:52 -07:00
25a0639463
Updating version to 9.1
2013-06-19 15:26:53 -07:00
bae9f3dc6a
Bumping up to released javax.websocket artifacts
2013-06-18 13:11:45 -07:00
dc0a8a5d40
JSR-356, fixing build
2013-06-05 17:36:23 -07:00
48dea3bb1d
JSR-356 adding basic MessageOutputStream support for writing to an OutputStream
2013-05-23 15:51:40 -07:00
97854b6c5b
JSR-356 adding support for ClientEndpointConfig.Configurator
2013-05-22 15:15:05 -07:00
ce0435e099
Cleaning up test output
2013-05-09 14:29:59 -07:00
9f82849900
Merge from [master] to [javawebsocket-jsr]
2013-05-09 12:10:57 -07:00
092a91008c
JSR-356 fixing EndpointConfig use with extends Endpoint
2013-04-26 09:30:02 -07:00
c91c3f2f60
JSR-356: adding WebSocketConfiguration and reworking ServerContainer init
2013-04-24 14:33:46 -07:00
a4644dc780
JSR-356 working out server endpoint creation
2013-04-23 11:06:01 -07:00
7c0f30fc2c
Bumping up version to 9.0.3-SNAPSHOT
2013-04-22 11:03:25 -07:00
1f45b3678b
Updating version
2013-04-15 12:39:15 -07:00
fe25ef0454
JSR-356 working on server handlers
2013-04-15 12:11:57 -07:00
e0d353629f
JSR-356 - updates to Session tracking and start of PathMappings
...
+ Refactored websocket-commons Session creation to be factory based
+ Introduced new org.eclipse.jetty.websocket.common.SessionFactory
+ Made websocket-client and websocket-server use new SessionFactory
+ Introduced JsrSessionFactory to allow for consistent Session creation
even in the Jsr (no more duplciate Session creation)
+ Using JsrSessionFactory in javax-websocket-client-impl
+ Introducing PathMappings to hopefully replace jetty-util's PathMap
+ Using standard ClientEndpointConfig when appropriate.
+ Introducing JettyClientEndpointConfig for annotation based
configurations
+ Renaming EchoSocket used in javax.websocket client testing to
JettyEchoSocket to better indicate that its the Jetty server side
implementation and not the javax.websocket client side socket.
+ Changed IncomingFrames.incomingError() parameter from
WebSocketException to Throwable to match behavior on the JSR
2013-04-09 11:21:59 -07:00
d1692733f5
JSR-356: MessageHandler(s) layer
2013-04-04 12:03:11 -07:00
3a66b3ec3f
JSR-356 first working annotated @ClientEndpoint echo test
2013-03-28 10:51:45 -07:00
fc7526b739
[JSR-356] Refactoring annotated callables to handle any-order rule
2013-03-26 17:30:49 -07:00
3c59f15a5c
Some basic @ServerEndpoint scanning tests
2013-03-25 09:56:04 -07:00
a498107c42
Parameter identification refactor + Decoder and PathParam integration
2013-03-22 13:18:02 -07:00
96df602e9e
Initial pass at fixing build for websocket PFD
2013-03-18 16:50:07 -07:00
22fe9d419e
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Rounding out the Encoders / Decoders base implementation
2013-02-20 15:58:04 -07:00
54a4818511
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Defining Decoders and Encoders
+ Trying to work out the Type assignment matching for Decoders
2013-02-19 16:24:34 -07:00
6e5ab19c58
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Trying to noodle out the @WebSocketMessage validation with Decoders in
the mix
2013-02-15 14:33:15 -07:00
7d1f774c0e
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Adding support for @WebSocketClient method scanning of
@WebSocketOpen
@WebSocketClose
@WebSocketError
2013-02-15 12:26:35 -07:00
820e20f042
Fixing license headers
2013-02-15 10:03:14 -07:00
2faba0bf4b
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Start of @WebSocketClient class/method scanning with tests
2013-02-14 16:24:07 -07:00
4fb1bc80da
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Refactoring EventDriver to be more pluggable (for jsr endpoints)
2013-02-13 13:37:26 -07:00
43231d8451
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Restarting branch, copying over work from November with new JSR-356
Draft 012 api in mind.
2013-02-12 16:19:35 -07:00
Greg Wilkins
Simone Bordet
Joakim Erdfelt
Jesse McConnell
Jan Bartel