Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,317 Commits 68 Branches 465 Tags 359 MiB
Commit Graph

924 Commits

Author SHA1 Message Date
Joakim Erdfelt c1f4dbbfec Replacing WebSocketFrame.ByteBuffer with byte[] array 2012-07-06 11:58:45 -07:00
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 ae56940796 Moving more tests to new structure 2012-07-06 09:47:11 -07:00
Joakim Erdfelt 4fadeb6b4a Reenabling message echo 2012-07-06 09:46:53 -07:00
Joakim Erdfelt 4e6a3dd2fd Making BlockheadClient a bit more friendly for debugging 2012-07-06 09:46:30 -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 89d6e8ddbf Fixing compile issues 2012-07-06 08:49:30 -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
Greg Wilkins db8d5089e8 383881 WebSocketHandler sets request as handled 2012-07-04 10:50:47 +02:00
Joakim Erdfelt 3df516779b Adding policy maxPayloadSize and autoFragmentSize 2012-07-03 16:13:44 -07:00
Joakim Erdfelt 89bd36dbaf Making fix for out of order events by moving registerWebSockets to doStart and not the constructor 2012-07-03 11:58:53 -07:00
Joakim Erdfelt 4549afbcf0 Setting SSL tests to @Ignore (till we implement the SSL bits again) 2012-07-03 11:56:27 -07:00
Joakim Erdfelt 8690348670 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-03 11:54:46 -07:00
Joakim Erdfelt d815a9c7d2 Fixing more build related issues 2012-07-03 11:53:46 -07:00
Jesse McConnell 96dc53e496 commiting ignored case til we support streaming 2012-07-03 13:44:49 -05:00
Joakim Erdfelt c97c22d6d6 Fixing compilation issues 2012-07-03 11:42:11 -07:00
Joakim Erdfelt d70174f159 Cleaning up all of the old uncompilable websocket source 2012-07-03 11:31:16 -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 63ead191bf Using connector.getByteBufferPool() vs creating a new pool per WebSocketAsyncConnection 2012-07-02 08:54:42 -07:00
Joakim Erdfelt beca3f9bd0 Renaming AsyncWebSocketConnection to WebSocketAsyncConnection per discussion 2012-07-02 08:51:37 -07:00
Joakim Erdfelt e60001fab8 Fixing exception expectation on testcase 2012-07-02 07:49:34 -07:00
Joakim Erdfelt 9f23e89756 Switching from websocket uri to http uri to use uri.port defaults around http specific scheme more appropriately 2012-07-02 07:23:55 -07:00
Joakim Erdfelt 990eba7ef4 Fixing javadoc 2012-07-02 07:12:31 -07:00
Joakim Erdfelt 39d8cd1b27 Overhauling CloseException to terminate the connection when encountered 2012-06-29 15:56:08 -07:00
Joakim Erdfelt 16d366e427 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-29 15:12:11 -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
Jesse McConnell e86a3a400e connection cased invalid status code response tests 2012-06-29 17:10:19 -05:00
Joakim Erdfelt 3fa89ea577 Fixing buffer flip logic 2012-06-29 13:00:08 -07:00
Jesse McConnell ce90b8581b shorthand notation for g and p 2012-06-29 14:30:50 -05:00
Jesse McConnell 1899a938d0 some generator debug logging 2012-06-29 14:26:33 -05:00
Joakim Erdfelt e47c47f071 Fixing endpoint.fillInterested() missing piece 2012-06-29 12:11:00 -07: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 cd3c47ef0e Attempting to get AsyncWebSocketConnection to actually get a onFillable() call 2012-06-29 11:04:38 -07:00
Joakim Erdfelt f28324e31a Initial pass at BlockheadClient and SimpleServletServer to aid in unit testing 2012-06-29 10:08:10 -07:00
Joakim Erdfelt 9de009c1b2 Fixing failed upgrade due to invalid request websocket version 2012-06-29 09:12:59 -07:00
Joakim Erdfelt e30e5976b4 Fixing failed upgrade due to invalid request websocket version 2012-06-29 09:12:55 -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 e32249c24f Fixing old testcase as fallout from API updates 2012-06-26 16:36:38 -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 6cadf8ebb9 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-26 14:16:31 -05:00
Jesse McConnell 88ef0c5428 update to new bytebuffer setup 2012-06-26 14:16:13 -05:00
Joakim Erdfelt e1488f8c92 Cleaning up websocket-server module 2012-06-26 12:15:21 -07:00
Jesse McConnell 604f700a82 revert change 2012-06-26 13:52:20 -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 4daa27b1d8 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-26 11:14:45 -05:00
Jesse McConnell 89a26e6d75 add note to 64bit length code in frame generator 2012-06-26 11:14:34 -05:00
Joakim Erdfelt d2056f3eb2 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-26 09:01:36 -07:00
Joakim Erdfelt 79a47e7bcf Now that Connection:Upgrade response header does its thing, re-enabling test for it in websocket 2012-06-26 09:01:29 -07: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 970d0764f7 Working towards a happy websocket-server connection + handshake 2012-06-25 13:48:05 -07: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
Joakim Erdfelt ce9e7b7560 Fixing framing issues on gen 2012-06-22 14:07:36 -07:00
Jesse McConnell 4df532a211 couple more tests and an issue exposed in frame handler 2012-06-22 15:55:08 -05:00
Joakim Erdfelt 853905a7c0 Collaborating with Jesse on WebSocket API 2012-06-22 06:32:21 -07:00
Joakim Erdfelt 1a73c74d96 Fixing generator and parser unit tests 2012-06-21 15:31:04 -07:00
Joakim Erdfelt f80024bf2b Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-21 14:26:07 -07:00
Joakim Erdfelt 5a529ad4a2 Refactoring out the contents of the .api.WebSocket class in prep for rethink of original API class 2012-06-21 14:25:58 -07:00
Jesse McConnell f4a644347b some frame consolidation work in progress 2012-06-21 16:22:17 -05:00
Jesse McConnell aaf27d7e2a test 2012-06-21 13:13:08 -05:00
Jesse McConnell d8c12b5813 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-21 13:11:27 -05:00
Joakim Erdfelt dc68d30b4b Continuing refactoring of websocket-server by commenting out no longer available classes (no more red) 2012-06-21 11:11:04 -07:00
Joakim Erdfelt ec51481c02 Adding Generator to Parser roundtrip test cases (refactored from old codebase) 2012-06-21 11:05:20 -07:00
Joakim Erdfelt 8e21e14c6d Minor documentation updates 2012-06-21 11:04:44 -07:00
Joakim Erdfelt 37249d09db Adding TEXT & BINARY to root generator map 2012-06-21 11:04:13 -07:00
Joakim Erdfelt dd668f7d8a Adding TextFrame(String) constructor 2012-06-21 11:03:51 -07:00
Joakim Erdfelt b3a26517db WebSocketPolicy new fields and documentation updates 2012-06-21 11:03:30 -07:00
Jesse McConnell a73d057578 ironing out generator issues at the byte lvl, so nice bit of progress 2012-06-20 18:42:24 -05:00
Joakim Erdfelt 5f5d613eba Removing old testcase (has replacements using new parser framework) 2012-06-20 14:44:12 -07:00
Joakim Erdfelt 4757a1a3ee Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-20 14:43:26 -07:00
Joakim Erdfelt 1692b4f7c2 Adding ClosePayloadParser & Tests 2012-06-20 14:43:16 -07:00
Jesse McConnell 8893b9c96a add text and binary frame generators 2012-06-20 16:34:45 -05:00
Joakim Erdfelt b61a58ad64 Adding policy violation testcase for parsing too large text frames 2012-06-20 14:19:55 -07:00
Joakim Erdfelt 085127c8f8 Integrating new policy changes 2012-06-20 14:08:47 -07:00
Joakim Erdfelt 2e6c307adc Refactoring WebSocketSettings to WebSocketPolicy to better conform to naming in use within RFC 6455 spec (discussed with jesse over phone) 2012-06-20 13:48:12 -07:00
Joakim Erdfelt d675be84ba Adding more testcases for Text Frames (and bug fixes) 2012-06-20 13:39:17 -07:00
Joakim Erdfelt ad6eee39d6 Minor formatting update 2012-06-20 11:30:04 -07:00
Joakim Erdfelt bec39bc953 Removing debug logigng from tests 2012-06-20 11:29:58 -07:00
Joakim Erdfelt 4fd00431d5 Finished Parsing of RFC 6455 examples 2012-06-20 11:13:21 -07:00
Jesse McConnell 917b84c454 working mask generator unit test 2012-06-20 09:56:59 -05:00
Jesse McConnell 75c99dbaff remove unneeded file 2012-06-20 09:30:57 -05:00
Jesse McConnell b6acc45820 maskgen -> masker + new packaging 2012-06-20 09:12:30 -05:00
Jesse McConnell c0d92cebd7 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-19 17:27:14 -05:00
Jesse McConnell a718d30a67 gettings settings down into generator, not sure this is right for masking or not yet 2012-06-19 17:27:02 -05:00
Jesse McConnell 2c26326998 gettings settings down into generator, not sure this is right for masking or not yet 2012-06-19 17:26:17 -05:00
Joakim Erdfelt 8bab5beb2b Cleanup around FrameParser.copyBuffer() 2012-06-19 15:17:14 -07:00
Joakim Erdfelt dcfa524211 Working TextFrame parsing (with masking) 2012-06-19 15:03:43 -07:00
Joakim Erdfelt 763b0b500d Adding ByteBufferAssert.assertEquals(String,ByteBuffer,ByteBuffer) 2012-06-19 14:43:42 -07:00
Joakim Erdfelt 8065d04a0d Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-19 14:38:15 -07:00
Joakim Erdfelt 03a1b68f38 Adding ByteBufferAssert to aide in testing 2012-06-19 14:38:02 -07:00
Jesse McConnell 8e1645f06b put framing butting in new buffer 2012-06-19 16:27:53 -05:00
Joakim Erdfelt 30901917eb Reworking Generator (with jesse on a hangout) 2012-06-19 14:05:47 -07:00
Joakim Erdfelt 228565068f Fixing method names to be consistent 2012-06-19 13:10:39 -07:00
Joakim Erdfelt 6bbeba9f59 Fixing PingPayloadParser with new FrameParser.copyBuffer() method 2012-06-19 13:07:57 -07:00
Joakim Erdfelt 17a7b12df1 Eliminating BaseFrame copy constructors and methods, fixing PongFrame(PingFrame) constructor 2012-06-19 12:28:51 -07:00
Joakim Erdfelt 9178bce643 Adding WebSocketSettings, integrating into Parser 2012-06-19 12:23:46 -07:00
Joakim Erdfelt 114ff6878b Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-19 11:14:05 -07:00
Joakim Erdfelt c1f3ad8d0e Cleaning up parsing layer to be less finicky 2012-06-19 11:13:54 -07:00
Jesse McConnell 289fb7c395 move payload into control frame, not doing close frame's reason and status code since we can 
't create bytebuffers in the frames atm
 2012-06-19 13:12:53 -05:00
Joakim Erdfelt 993c3788b9 Fixing up PongFrame to match PingFrame 2012-06-19 10:22:39 -07:00
Joakim Erdfelt 236bcb2b86 Adding RFC6455 parsing examples 2012-06-19 10:22:14 -07:00
Joakim Erdfelt 7227a86254 Initial pass at testing 2012-06-18 15:41:38 -07:00
Joakim Erdfelt f3532f9bd9 Moving test cases around, commenting others, we have a clean build of websocket-core now, suitable for testing 2012-06-18 14:38:49 -07:00
Joakim Erdfelt 3fa8a6ad3e Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-18 14:34:36 -07:00
Joakim Erdfelt 0866a75ce6 Making src/main/java error free (for build reasons) 2012-06-18 14:34:21 -07:00
Jesse McConnell d8893b4823 add simple test example 2012-06-18 16:30:19 -05:00
Joakim Erdfelt a4a5108da4 Merge fixes 2012-06-18 14:27:24 -07:00
Joakim Erdfelt cb6968d680 Introduction PayloadParser and OpCodes 2012-06-18 14:24:24 -07:00
Jesse McConnell 2562dc838b ping and close generators akin what we are looking at (atm at least) 2012-06-18 16:06:46 -05:00
Joakim Erdfelt b9ca387d53 Cleaning up 'frames' package 2012-06-18 13:42:47 -07:00
Jesse McConnell b696915b29 minor structural updates with joakim's latest 2012-06-18 14:03:25 -05:00
Jesse McConnell 6679c9436e minor structural updates with joakim's latest 2012-06-18 14:03:22 -05:00
Joakim Erdfelt 541ce89c5b Updates to BaseFrame and Parsers 2012-06-18 11:59:51 -07:00
Jesse McConnell c6802c75c8 add empty header placeholder 2012-06-18 13:10:39 -05:00
Jesse McConnell f4a416586e add ping, pong, close frames extending from a controlframe 2012-06-18 13:02:27 -05:00
Joakim Erdfelt 145b98a663 Reworking BaseFrame and WebSocket api classes 2012-06-18 10:28:19 -07:00
Jesse McConnell 1264f1aacc set baseframe as default type for interim 2012-06-18 12:10:04 -05:00
Joakim Erdfelt e768c37e50 Establishing BaseFrame 2012-06-18 10:08:10 -07:00
Joakim Erdfelt 494ecbb271 Renaming module and groupId for websocket-servlet to websocket-server to better reflect nature of module 2012-06-18 09:48:33 -07:00
Joakim Erdfelt 4c18bd5f45 Moving WebSocketHandler out of websocket-core into websocket-servlet 2012-06-18 09:37:07 -07:00
Joakim Erdfelt 6d09fb70fd Moving MaskGen into org.eclipse.jetty.websocket.generator package space 2012-06-12 13:57:12 -07:00
Joakim Erdfelt c7b2297216 Moving classes around, stubbing out new classes for jetty-9 refactor 2012-06-12 13:15:40 -07:00
Joakim Erdfelt d52de82a80 Splitting up websocket module into core/client/servlet modules 2012-06-12 12:43:29 -07:00
Greg Wilkins 0b56e3ae7c jetty-9 starting to cleanup websocket and client 2012-06-07 14:11:40 +02:00
Jesse McConnell 30e8e40ef2 [maven-release-plugin] prepare for next development iteration 2012-05-24 15:41:45 -05:00
Jesse McConnell 667cf9a643 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 15:41:38 -05:00
Jesse McConnell d23a3c90b5 [maven-release-plugin] prepare for next development iteration 2012-05-24 15:40:47 -05:00
Jesse McConnell 57c73283d8 [maven-release-plugin] prepare release jetty-7.6.4.v20120524 2012-05-24 15:40:35 -05:00
Jesse McConnell e45a89694a [maven-release-plugin] prepare for next development iteration 2012-05-24 09:30:58 -05:00
Jesse McConnell 36fc6fe890 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 09:30:52 -05:00
Jesse McConnell 035e16aedc [maven-release-plugin] prepare for next development iteration 2012-05-24 09:27:27 -05:00
Jesse McConnell f8c629026d [maven-release-plugin] prepare release jetty-7.6.4.v20120524 2012-05-24 09:27:21 -05:00
Jesse McConnell c7a9adaa32 reset for release 2012-05-24 08:33:44 -05:00
Jesse McConnell c8fe38733f reset versions for release 2012-05-24 08:30:26 -05:00
Jesse McConnell ea176f0586 [maven-release-plugin] prepare for next development iteration 2012-05-22 15:14:05 -05:00
Jesse McConnell 3fdda881d8 [maven-release-plugin] prepare release jetty-8.1.4.v20120522 2012-05-22 15:13:56 -05:00
Jesse McConnell 300a37319a [maven-release-plugin] prepare for next development iteration 2012-05-22 14:34:10 -05:00
Jesse McConnell 9ccd059375 [maven-release-plugin] prepare release jetty-7.6.4.v20120522 2012-05-22 14:33:59 -05:00
Jesse McConnell d292c67b7d [maven-release-plugin] prepare for next development iteration 2012-04-16 09:37:37 -05:00
Jesse McConnell eabdb734ef [maven-release-plugin] prepare release jetty-8.1.3.v20120416 2012-04-16 09:37:31 -05:00
Jesse McConnell 10e269ad68 [maven-release-plugin] prepare for next development iteration 2012-04-16 09:37:15 -05:00
Jesse McConnell df1f709ea2 [maven-release-plugin] prepare release jetty-7.6.3.v20120416 2012-04-16 09:37:08 -05:00
Jesse McConnell b64909900c [maven-release-plugin] prepare for next development iteration 2012-04-13 15:31:47 -05:00
Jesse McConnell 2c0a35d430 [maven-release-plugin] prepare release jetty-8.1.3.v20120413 2012-04-13 15:31:38 -05:00
Jesse McConnell b963840d40 [maven-release-plugin] prepare for next development iteration 2012-04-13 15:29:14 -05:00
Jesse McConnell a652ee7396 [maven-release-plugin] prepare release jetty-7.6.3.v20120413 2012-04-13 15:29:05 -05:00
Simone Bordet 72040202d4 Reverted release back to 8.1.3-SNAPSHOT. 2012-04-13 17:27:37 +02:00
Simone Bordet 85710fb9ea Reverted release back to 7.6.3-SNAPSHOT. 2012-04-13 16:59:06 +02:00
Jesse McConnell 3b87e91cbe [maven-release-plugin] prepare for next development iteration 2012-04-12 10:29:30 -05:00
Jesse McConnell 308b010744 [maven-release-plugin] prepare release jetty-8.1.3.v20120412 2012-04-12 10:29:20 -05:00
Jesse McConnell cdcc0922c3 [maven-release-plugin] prepare for next development iteration 2012-04-12 09:49:52 -05:00
Jesse McConnell 5966c86571 [maven-release-plugin] prepare release jetty-7.6.3.v20120412 2012-04-12 09:49:46 -05:00
Jesse McConnell b4985ad0d5 [maven-release-plugin] prepare for next development iteration 2012-03-08 23:53:50 -06:00
Jesse McConnell 7a99af4ffe [maven-release-plugin] prepare release jetty-8.1.2.v20120308 2012-03-08 23:53:42 -06:00
Jesse McConnell 246e3ed756 [maven-release-plugin] prepare for next development iteration 2012-03-08 21:09:46 -06:00
Jesse McConnell a63b3fdc5e [maven-release-plugin] prepare release jetty-7.6.2.v20120308 2012-03-08 21:09:37 -06:00
Greg Wilkins 03525bfe46 jetty-9 javadoc and code cleanups 2012-03-08 15:18:17 +11:00
Jesse McConnell 50d92ec8ef reset versions 2012-03-06 17:07:53 -06:00
Jesse McConnell f12e3c390c reset versions 2012-03-06 17:06:10 -06:00
Jesse McConnell d1c8c477ea [maven-release-plugin] prepare for next development iteration 2012-03-02 08:57:43 -06:00
Jesse McConnell b75868e84f [maven-release-plugin] prepare release jetty-8.1.2.v20120302 2012-03-02 08:57:19 -06:00
Jesse McConnell 51311d050e [maven-release-plugin] prepare for next development iteration 2012-03-02 08:37:46 -06:00
Jesse McConnell a8296ec3d5 [maven-release-plugin] prepare release jetty-7.6.2.v20120302 2012-03-02 08:37:38 -06:00
Jesse McConnell 8b20316efc Merge branch 'master' into jetty-8 2012-02-24 06:48:50 -06:00
Simone Bordet 2e66e54425 370387 - SafariWebsocketDraft0Test failure during build. 
The reason for the failure of this test was that a BufferedReader was used to read the header lines.
However, the buffered reader may have read and buffered also the hixie bytes and subsequently,
when the test was trying to read the hixie bytes directly from the input stream (and not from the
buffered reader), the read was timing out.
Fixed by always using the input stream to read the header and hixie bytes.
 2012-02-24 11:26:50 +01:00
Jesse McConnell ac79497dee [maven-release-plugin] prepare for next development iteration 2012-02-15 14:29:36 -06:00
Jesse McConnell 3705b424c8 [maven-release-plugin] prepare release jetty-8.1.1.v20120215 2012-02-15 14:29:28 -06:00
Jesse McConnell efb6883cf0 [maven-release-plugin] prepare for next development iteration 2012-02-15 14:22:19 -06:00
Jesse McConnell baf2b94f77 [maven-release-plugin] prepare release jetty-7.6.1.v20120215 2012-02-15 14:22:12 -06:00
Jesse McConnell 098428dd37 Merge branch 'master' into jetty-8 2012-02-15 13:49:23 -06:00
Joakim Erdfelt 4caf662182 Improve test failure on truncated Draft0 handshake read. 
+ If a truncated response occurs, attempt to have the test case produce
  a meaningful response message indicating where/how the truncation
  occured, instead of just a 'read timeout'.
 2012-02-13 11:46:20 -07:00
Joakim Erdfelt e7608eafae Trying to get more information from failing Websocket Draft0 test failure 2012-02-13 11:06:02 -07:00
Joakim Erdfelt f7fd3a4680 Bumping up socket read timeout and adding debug. 2012-02-09 15:39:49 -07:00
Greg Wilkins 824509b0fb jetty-9 removed plurals from enum type names 2012-02-10 00:42:44 +11:00
Greg Wilkins c1bcec61d5 jetty-9 jetty-io mostly working with all NIO buffers. Occassional failure in SSL stress test 2012-02-07 11:32:00 +11:00
Joakim Erdfelt 9207423ca0 Fixing JDK5 build abort due to bad javadocs 2012-02-06 10:01:44 -07:00
Jesse McConnell 6b079ae3d8 merge from master 2012-02-01 17:25:08 -06:00
Joakim Erdfelt fdaad62b63 Migrating old javax.* deps to new org.eclipse.jetty.orbit deps 
+ Removed old deps in javax.*, geronimo, and asm in favor of
  new org.eclipse.jetty.orbit deps
+ Added enforcer rule to prevent reintroducing the old deps.
 2012-01-31 15:21:58 -07:00
Jesse McConnell 6e44f4db5f [maven-release-plugin] prepare for next development iteration 2012-01-27 08:15:45 -06:00
Jesse McConnell 9d1ca3593e [maven-release-plugin] prepare release jetty-8.1.0.v20120127 2012-01-27 08:15:38 -06:00
Jesse McConnell ad6126553b [maven-release-plugin] prepare for next development iteration 2012-01-27 08:13:06 -06:00
Jesse McConnell 4e25f7bb05 [maven-release-plugin] prepare release jetty-7.6.0.v20120127 2012-01-27 08:13:00 -06:00
Jesse McConnell f2d0fd3cc8 revert back to 8.1.0-SNAPSHOT 2012-01-26 10:45:06 -06:00
Jesse McConnell 7ac9eb585f revert back to 7.6.0-SNAPSHOT 2012-01-26 10:42:11 -06:00
Jesse McConnell e98ae91ca6 [maven-release-plugin] prepare for next development iteration 2012-01-25 11:16:11 -06:00
Jesse McConnell fb30166a7f [maven-release-plugin] prepare release jetty-8.1.0.v20120125 2012-01-25 11:16:05 -06:00
Jesse McConnell 0c96fc40ea [maven-release-plugin] prepare for next development iteration 2012-01-25 09:31:06 -06:00
Jesse McConnell b455b7d94e [maven-release-plugin] prepare release jetty-7.6.0.v20120125 2012-01-25 09:30:55 -06:00
Jesse McConnell ec731e691d [maven-release-plugin] prepare for next development iteration 2012-01-20 12:28:31 -06:00
Jesse McConnell 6004fd4553 [maven-release-plugin] prepare release jetty-8.1.0.RC5 2012-01-20 12:28:24 -06:00
Jesse McConnell 16833ca8c9 [maven-release-plugin] prepare for next development iteration 2012-01-20 10:50:24 -06:00
Jesse McConnell dd80d7e868 [maven-release-plugin] prepare release jetty-7.6.0.RC5 2012-01-20 10:50:14 -06:00
Jan Bartel 98684397fd Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-18 14:17:41 +11:00
Greg Wilkins 9ff8633554 368821 SslConnection.handle always calls wrapped Connection.handle, so state can be processed 2012-01-18 13:39:24 +11:00
Joakim Erdfelt b6a51f0c06 Updating testcase to indicate reason of failure (when testing on OSX) 2012-01-17 13:33:41 -07:00
Greg Wilkins b8e0258faf Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java
 2012-01-12 11:01:03 +11:00
Greg Wilkins c5e3ed5afe improved test timing 2012-01-11 16:39:03 +11:00
Jan Bartel 691efcc7ca Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-11 16:35:57 +11:00
Simone Bordet cecfa69a13 368189 - WebSocketClientFactory should not manage external thread pool. 
368240 - Improve AggregateLifeCycle handling of shared lifecycles

Reworked the implementation in order to follow 368240.
 2012-01-10 18:10:24 +01:00
Jan Bartel 1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11:00
Simone Bordet 27cbf0bf78 367099 - Upgrade jetty-websocket for RFC 6455 - Addendum. 
The WebSocket parser was forgot in the renaming.
Took also the chance to remove hardcoded "D13" string in toString() methods.
 2012-01-09 20:27:46 +01:00
Simone Bordet 71ea564f0b 368189 - WebSocketClientFactory should not manage external thread pool. 2012-01-09 20:15:22 +01:00
Simone Bordet e666ed67cb 368035 - WebSocketClientFactory does not invoke super.doStop(). 2012-01-06 15:41:55 +01:00
Simone Bordet 06f0498a48 Made tests more reliable by waiting for the websocket connection to be established 
and for onOpen() to be called.
 2012-01-03 12:15:51 +01:00
Greg Wilkins 3141b50fa0 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-30 20:19:39 +11:00
Greg Wilkins 2b54d45280 367435 improved D00 test harness 2011-12-28 13:35:44 +11:00
Simone Bordet 3a1aff9221 Using a random port for the tests. 2011-12-23 23:59:05 +01:00
Simone Bordet 9e6dcc1c11 Restored constructor that was removed, used in CometD. 2011-12-23 23:54:55 +01:00
Simone Bordet 3cda41248e 367502 - WebSocket connections should be closed when application context is stopped. 2011-12-23 23:43:02 +01:00
Simone Bordet 62f47e0617 367502 - WebSocket connections should be closed when application context is stopped. 2011-12-23 17:20:57 +01:00
Jesse McConnell ed46b71f37 Merge branch 'master' into jetty-8 2011-12-23 07:44:29 -06:00
Greg Wilkins 34dc926c59 367433 added tests to investigate 2011-12-23 19:19:20 +11:00
Greg Wilkins b36425b7aa Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
 2011-12-22 09:52:11 +11:00
Simone Bordet ef23bf11b8 Merged from origin/master. 2011-12-21 10:45:06 +01:00
Jan Bartel c3643d9937 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-21 12:37:23 +11:00
Joakim Erdfelt 2ca897c1ea 367219 - WebSocketClient.open() fails when URI uses default ports. 
+ Fixing testcase to not fail if http://localhost/ exists.
  Reworking code to not rely on existence of server to validate the
  correct behavior of URI port parsing.
 2011-12-20 13:01:23 -07:00
Simone Bordet 8ea22a6a4c 367219 - WebSocketClient.open() fails when URI uses default ports. 2011-12-20 18:01:45 +01:00
Greg Wilkins 070a2b5759 JETTY-1463 websocket D0 parser should return progress even if no fill done 2011-12-20 14:54:50 +11:00
Greg Wilkins b67961ada3 JETTY-1463 websocket D0 parser should return progress even if no fill done 2011-12-20 12:00:48 +11:00
Joakim Erdfelt 960407492a Removing System.out debug 2011-12-19 13:13:57 -07:00