Commit Graph

220 Commits

Author SHA1 Message Date
Joakim Erdfelt c2872ff556 Renaming .frames.BaseFrame to .protocols.WebSocketFrame 2012-07-06 11:33:26 -07:00
Joakim Erdfelt dfc9315bc7 Next step in simplifying the frames 2012-07-06 11:32:22 -07:00
Joakim Erdfelt b515e845cc Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 11:01:33 -07:00
Jesse McConnell 3bd5ad1746 adding close util 2012-07-06 13:00:20 -05:00
Joakim Erdfelt 521e9371a6 Removing javadoc links to frame classes (being removed) 2012-07-06 10:55:53 -07:00
Jesse McConnell 100d1ee5d5 merge 2012-07-06 12:25:32 -05:00
Jesse McConnell 748c9b6305 core compiling but failing tests so I can work with joakim on reducing to one core frame 2012-07-06 12:23:10 -05:00
Joakim Erdfelt 70ff05e955 WebSocketAsyncConnection.write() with byte[] array fails occasionally 2012-07-06 10:22:41 -07:00
Joakim Erdfelt 84fa1163e9 Fixing write of byte buffer 2012-07-06 10:06:05 -07:00
Joakim Erdfelt 2fca248352 Fixing clearToFill bug 2012-07-06 09:45:24 -07:00
Joakim Erdfelt 03443cd237 Making debug on generator a bit more useful 2012-07-06 09:45:13 -07:00
Joakim Erdfelt 9129130a0b Allowing .setPayload() with byte arrays in BaseFrame 2012-07-06 09:44:49 -07:00
Joakim Erdfelt 4f30fe2a40 Fleshing out WebSocketPing impl 2012-07-06 08:44:56 -07:00
Joakim Erdfelt 3b2aa4c45e Moving ExtensionConfig into .protocol. package 2012-07-06 08:43:36 -07:00
Joakim Erdfelt cd46dc3cee More cleanup of websocket-server 2012-07-05 17:07:56 -07:00
Jesse McConnell 23c6c81615 move a test around, add in the basics of a frame builder and some test cases using it as an example, need to decide to complete the builder with masking or smoke it 2012-07-05 18:38:46 -05:00
Joakim Erdfelt 8fa35533b6 Moving ExtensionConfig out of .api and into .extensions where it belongs 2012-07-05 16:29:14 -07:00
Joakim Erdfelt 11280ca22d Moving packages around, cleaning up the test cases structure too 2012-07-05 16:27:45 -07:00
Joakim Erdfelt fa023ebc6c Integrating the new Frame interface 2012-07-05 16:14:57 -07:00
Joakim Erdfelt 46452b9c7a Adding beginnings of Streaming support in WebSocketEventDriver 2012-07-05 16:11:11 -07:00
Joakim Erdfelt d163fb4414 Updating EventMethodsCache (and tests) for new OnWebSocketMessage annotation 2012-07-05 15:04:20 -07:00
Joakim Erdfelt c7fcb6e694 Cleaning up Annotations
+ Removing @OnWebSocketText
+ Removing @OnWebSocketBinary
+ Starting to rework EventMethods + WebSocketEventDriver for new
  @OnWebSocketMessage annotation
+ Updating various example/demo/test sockets for this new reality.
2012-07-05 14:02:21 -07:00
Joakim Erdfelt 502731d719 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-05 12:21:06 -07:00
Joakim Erdfelt 1529baea92 Start of refactor from dev community discussion 2012-07-05 12:20:51 -07:00
Greg Wilkins 2b4bf3ef26 jetty-9 moved connection upgrade support to HttpConnection completed 2012-07-04 14:19:38 +02:00
Greg Wilkins 05f9ba8244 jetty-9 moved connection upgrade support to HttpConnection completed 2012-07-04 14:17:41 +02:00
Joakim Erdfelt 3df516779b Adding policy maxPayloadSize and autoFragmentSize 2012-07-03 16:13:44 -07:00
Joakim Erdfelt d815a9c7d2 Fixing more build related issues 2012-07-03 11:53:46 -07:00
Joakim Erdfelt 7d4da60d05 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-02 15:59:44 -07:00
Joakim Erdfelt f27fff4902 Initial work on websocket-client using SPDY as example 2012-07-02 15:59:35 -07:00
Jesse McConnell 46da5fe5e2 couple more test cases and fixed fragmented control frame response 2012-07-02 17:23:16 -05:00
Jesse McConnell 2d5fa0a3bc close short to int 2012-07-02 16:06:43 -05:00
Joakim Erdfelt 40faff2ab7 Adding TODOs from review discussion 2012-07-02 10:39:20 -07:00
Joakim Erdfelt e60001fab8 Fixing exception expectation on testcase 2012-07-02 07:49:34 -07:00
Joakim Erdfelt 39d8cd1b27 Overhauling CloseException to terminate the connection when encountered 2012-06-29 15:56:08 -07:00
Joakim Erdfelt 0a301b153e Adding ability to issue close(SERVER_ERROR) on unhandled exception during parse/notify flows 2012-06-29 15:12:05 -07:00
Joakim Erdfelt 3fa89ea577 Fixing buffer flip logic 2012-06-29 13:00:08 -07:00
Jesse McConnell 1899a938d0 some generator debug logging 2012-06-29 14:26:33 -05:00
Joakim Erdfelt 9011b0713d Adding more logging 2012-06-29 12:05:15 -07:00
Joakim Erdfelt 564e56b223 Merge 2012-06-29 11:57:11 -07:00
Joakim Erdfelt b748ff0bea Fixing src/test/resources mistakes 2012-06-29 11:56:22 -07:00
Jesse McConnell 81372c2b7d cleaner generator toString() 2012-06-29 13:55:36 -05:00
Joakim Erdfelt 1a56a63045 Fixing src/test/resources mistakes 2012-06-29 11:37:07 -07:00
Joakim Erdfelt 042dc41998 Making construction of TextFrame start with FIN=true 2012-06-29 11:29:03 -07:00
Joakim Erdfelt 57acc891ac Removing Debug class in favor of just using src/test/java/jetty-logging.properties 2012-06-29 09:09:14 -07:00
Jesse McConnell 9b2aee45ad removing tests that in hindsight ought to be connection level and not parser/generator level 2012-06-29 08:13:59 -05:00
Jesse McConnell acabb0a2da additional close frame testing 2012-06-29 07:51:19 -05:00
Joakim Erdfelt 54399545b1 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-28 15:30:46 -07:00
Joakim Erdfelt f56b2acd8d Removing old WebSocket interface API and fixing build failures as result 2012-06-28 15:30:29 -07:00
Joakim Erdfelt d2561acde4 Fleshing out the write methods on AsyncWebSocketConnection 2012-06-28 15:07:39 -07:00
Joakim Erdfelt 256dec3e91 Adding more test cases for WebSocketEventDriver 2012-06-28 14:41:57 -07:00
Jesse McConnell b01c3fb595 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-28 16:33:01 -05:00
Jesse McConnell 153daf4f3b tossing exceptions on a couple more edgecases and additional tests on close 2012-06-28 16:32:50 -05:00
Joakim Erdfelt 70b9f7245e ByteBuffer vs byte[] array tests 2012-06-28 14:27:51 -07:00
Joakim Erdfelt 9cd2f887d1 Making assert more sane 2012-06-28 14:10:04 -07:00
Joakim Erdfelt daf3fa4ddf Cleaning up logging 2012-06-28 14:09:52 -07:00
Jesse McConnell 03d37b58f2 switch from short to char to sidestep short java signage 2012-06-28 16:06:39 -05:00
Joakim Erdfelt 2c16fe552f Fixing close frame stuff 2012-06-28 14:05:13 -07:00
Joakim Erdfelt 787a87468f Reworking CloseFrame and ClosePayloadParser due to discoveries during testing 2012-06-28 13:52:48 -07:00
Joakim Erdfelt 928baef5d2 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-28 12:51:03 -07:00
Jesse McConnell 65166e6cc6 annoying hack around close frame logic for parser and generator 2012-06-28 14:50:36 -05:00
Joakim Erdfelt 9b31c35f15 Fixing up (byte[],int,int) vs (ByteBuffer) approaches on events 2012-06-28 12:49:59 -07:00
Joakim Erdfelt deef1a3ac1 First pass at WebSocketEventDriver with tests 2012-06-28 11:59:15 -07:00
Joakim Erdfelt 324431a072 Adding support for discovering annotations from superclass chain 2012-06-28 10:53:57 -07:00
Joakim Erdfelt 106db485ca Adding tests for bad method modifiers and return types 2012-06-28 10:22:27 -07:00
Joakim Erdfelt 891ab0b858 Test Not A Socket 2012-06-28 10:01:46 -07:00
Joakim Erdfelt 7e93c2a409 More duplicate @OnWebSocketBinary testing 2012-06-28 09:57:22 -07:00
Joakim Erdfelt 53425e061a Allowing multiple @OnWebSocketFrame annotations, but preventing duplicate declarations on the same frameType 2012-06-28 09:36:14 -07:00
Joakim Erdfelt 08796a7b37 Working EventMethod/EventMethods/EventMethodsCache with tests 2012-06-27 17:04:37 -07:00
Jesse McConnell 270a04ebd0 rename tests for surefire to pick them up 2012-06-27 15:53:56 -05:00
Joakim Erdfelt 7cda4df7e5 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-27 13:49:45 -07:00
Joakim Erdfelt 5c9a3d4bd3 API cleanup 2012-06-27 13:49:27 -07:00
Jesse McConnell 1ebc101a13 fix comment 2012-06-27 15:02:32 -05:00
Joakim Erdfelt a6bc9c1845 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-27 12:42:30 -07:00
Joakim Erdfelt 1e0752f5c8 More work towards API (this time on the server side) 2012-06-27 12:42:17 -07:00
Jesse McConnell 2e9cf50c3a close frame tests, statuscode is now int as it can't be unsigned short as spec requires, payload length parses clean with bad 1 byte payload packet 2012-06-27 14:36:33 -05:00
Jesse McConnell 984166641e tests for unknown control codes 2012-06-27 10:27:36 -05:00
Jesse McConnell 43d048f691 control frames can not set rsv bits + tests 2012-06-27 10:14:51 -05:00
Jesse McConnell fb7b9b2c19 additional testing of ping frames 2012-06-27 10:02:56 -05:00
Jesse McConnell a4ef07443a Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-27 09:10:33 -05:00
Jesse McConnell a0516774c0 empty frames with no constructor will generate correctly 2012-06-27 08:16:27 -05:00
Joakim Erdfelt fabb2e18a2 Cleaning up test cases 2012-06-26 16:41:39 -07:00
Joakim Erdfelt 334b7787cc Removing old generators (no longer used) 2012-06-26 16:35:52 -07:00
Joakim Erdfelt 41094cb685 Cleaning up the API after the discussion with Jesse 2012-06-26 16:35:23 -07:00
Joakim Erdfelt 4eeb433b44 Fixing 4 vs 8 byte payload length testing issue 2012-06-26 12:29:57 -07:00
Jesse McConnell 888314e08a update to new bytebuffer setup 2012-06-26 14:20:51 -05:00
Jesse McConnell 88ef0c5428 update to new bytebuffer setup 2012-06-26 14:16:13 -05:00
Jesse McConnell 9a9d24ecff binary tests akin to previous text frame tests 2012-06-26 13:48:25 -05:00
Joakim Erdfelt f9ef423be2 Eliminating the BufferPool management from the Generator as that's the wrong level to be managing BufferPool.release() 2012-06-26 11:10:29 -07:00
Joakim Erdfelt bf0c45d790 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-26 09:17:17 -07:00
Joakim Erdfelt c439bf3882 Fixing 64-bit payload length parsing issue 2012-06-26 09:17:04 -07:00
Jesse McConnell 89a26e6d75 add note to 64bit length code in frame generator 2012-06-26 11:14:34 -05:00
Jesse McConnell 6e2d9549c9 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-26 10:58:30 -05:00
Jesse McConnell 1a30f540bd more boundry tests and (temporary) fixes 2012-06-26 10:58:20 -05:00
Jesse McConnell ec3052d018 additional test cases coming, fix to parser for empty payloads and improvement to frame parser payload length insertion to byte buffer 2012-06-26 09:21:53 -05:00
Joakim Erdfelt e919c0dff8 Renaming ExtensionRef to ExtensionConfig, fleshing it out bunch more, and using it in Extension instance 2012-06-25 12:50:56 -07:00
Joakim Erdfelt 3cbcb20257 Deleting no longer needed handshake req/resp objects 2012-06-25 12:50:06 -07:00
Joakim Erdfelt 00d8f7b44d Dropping proposed WebSocket.Accept interface from websocket-core, it belongs in websocket-server 2012-06-25 12:49:42 -07:00
Jesse McConnell 5fb55086d4 last of the generator examples from spec 2012-06-25 09:10:12 -05:00
Joakim Erdfelt 8010c680e0 Early iteration of new API 2012-06-22 14:49:22 -07:00