Commit Graph

1048 Commits

Author SHA1 Message Date
Joakim Erdfelt 3621bec43c More AB tests, and updates to Fuzzer 2012-08-01 13:11:24 -07:00
Joakim Erdfelt 07929fee88 Fleshing out more fragment tests 2012-08-01 10:46:15 -07:00
Joakim Erdfelt 7c742ee4e8 More AB tests around bad/reserved opcodes 2012-08-01 09:59:50 -07:00
Joakim Erdfelt ab89924261 Fleshing out more AB case 4 tests 2012-07-31 15:24:33 -07:00
Joakim Erdfelt a97fe106f9 Reworking OpCode from enum to static class 2012-07-31 15:15:21 -07:00
Joakim Erdfelt 9a568514a6 More AB testing, reworked for Fuzzer 2012-07-31 12:52:22 -07:00
Joakim Erdfelt 7d2d40dc2b Fixing PING vs CLOSE ordering issues with outgoing queue 2012-07-30 14:51:34 -07:00
Joakim Erdfelt 30ae8370bd Fixing BlockheadClient and reading of frames 2012-07-30 12:40:01 -07:00
Joakim Erdfelt f34d74ec84 Some logging rework/repair 2012-07-30 12:39:30 -07:00
Joakim Erdfelt 9999db9c94 Fixing WebSocketAsyncConnection close/read logic to prevent unstoppable QTP threads 2012-07-30 09:54:45 -07:00
Joakim Erdfelt da2b457eaa Fixing compile issue 2012-07-30 05:38:51 -07:00
Joakim Erdfelt c2aae7c517 Attempting to come to grips with proper close/disconnect/stop/cleanup 2012-07-27 13:48:34 -07:00
Joakim Erdfelt f2c86b2d00 Adding close validation to TestABCase1 2012-07-27 10:52:46 -07:00
Joakim Erdfelt 99afabdf92 Finished fleshing out TestABCase1 2012-07-27 10:24:35 -07:00
Joakim Erdfelt 47f882e6dc Fixing various things around generate/parse of windowed fragments.
+ @WebSocket annotation's policy configuraiton is now optional
+ WebSocketPolicy.clonePolicy() fixed for other fields
+ WebSocketEventDriver now has internal WebSocket POJO specific logger
  to allow for logging control of the WebSocket POJO itself in case of
  runtime exceptions.
+ WebSocketEventDriver now honors bufferSize correctly.
+ DataFrameBytes always requests windowSize from generator, allowing
  generator to determine ultimate byteBuffer utilization itself.
+ MessageInputStream / MessageReader now clears the starting buffer
+ Generator now honors windowSize correctly (even if buffer obtained
  from ByteBufferPool.acquire() is much larger
+ Parser now demasks the payload after a successful parse of the framing
+ Various testing cleanup to produce less noisy output during testing.
2012-07-27 09:41:26 -07:00
Joakim Erdfelt cbcb76eaea More spec tests from server point of view 2012-07-26 15:45:54 -07:00
Joakim Erdfelt db2570c2ee 380928 - Implement new websocket close code 2012-07-26 10:30:12 -07:00
Joakim Erdfelt b3db5ffc8d Fixing websocket-server tests 2012-07-25 11:49:04 -07:00
Joakim Erdfelt 6fa2f67a96 Updates for Extensions
+ Extensions now report to Generator their requirements for
  RSV1, RSV2, RSV3
+ DeflateFrameExtension now reports RSV1 use.
+ DeflateFrameExtension reads uncompressed data properly now.
+ Unit tests for small/medium/large payloads on DeflateFrameExtension
+ OutgoingFrames.output() method now has non-optional throws IOException
2012-07-25 11:04:38 -07:00
Joakim Erdfelt 78b16d38f5 Adding more to AllTests 2012-07-25 09:35:12 -07:00
Joakim Erdfelt e46cc961ac Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-25 09:16:10 -07:00
Joakim Erdfelt a49238ceba Removing FragmentExtension's minFragments config.
+ The minFragments configuration appears to work on the message,
  not the fragments, so its was removed as inappropriate for the
  level of the protocol the FragmentExtension works on.
2012-07-24 13:21:35 -07:00
Joakim Erdfelt 36360ae1d2 Adding initial tests for FragmentExtension 2012-07-24 11:47:25 -07:00
Simone Bordet 822abe514e Jetty9 - Improved idle timeout handling.
Idle timeouts are not enforced anymore by polling the AsyncEndPoints from the SelectorManager,
but instead the AsyncEndPoints now take a SchedulerExecutorService as parameter and perform
their own enforcing of the idle timeout.

Also removed a few Timer usages (replaced by SchedulerExecutorService) and fixed XML files
referencing old APIs.
2012-07-24 10:38:28 +02:00
Joakim Erdfelt 9c4a8df8af Adding test for deflate-frame extension receiving non-compressed frames 2012-07-23 13:56:41 -07:00
Joakim Erdfelt 93b5d97379 Full core testing of DeflateFrameExtension
+ Renaming FrameParserCapture -> IncomingFramesCapture
+ Adding OutgoingFramesCapture
+ Fixing DeflateFrameExtension of small payloads
2012-07-23 13:52:08 -07:00
Simone Bordet d2a0cb5c50 Jetty9 - Fixed compilation problems. 2012-07-23 15:38:27 +02:00
Simone Bordet 6b4583b461 Jetty9 - Introduced a onReadTimeout() callback and refactored into AbstractAsyncConnection.onOpen() calls to onFillInterested() that were previously done by all subclasses. 2012-07-23 14:27:33 +02:00
Joakim Erdfelt b5d23b1c64 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-20 07:00:17 -07:00
Simone Bordet 6aba6d1e8c Jetty9 - Refactored SelectorManager and SelectChannelEndPoint.
Simplified Selectable interface, and improved idle timeout checking.
2012-07-20 13:04:28 +02:00
Joakim Erdfelt f58182d2ab Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-19 14:10:15 -07:00
Joakim Erdfelt 4af5a10b29 Working out bug in client parsing of lots of messages 2012-07-19 14:10:07 -07:00
Simone Bordet dfeb761306 Jetty9 - Now calling SelectorManager.newConnection() from a single call site rather than having to duplicate the call in every newEndPoint() implementation. 2012-07-19 18:43:23 +02:00
Joakim Erdfelt 796e240545 Fixing aggregate message echo test 2012-07-18 13:23:07 -07:00
Joakim Erdfelt 1c77ef0723 Fixing bad generator.generate() assumptions on output bytebuffer state 2012-07-18 12:36:42 -07:00
Joakim Erdfelt b0e475f09c Fixing invalid statuscode error that shouldn't be thrown on no-status code 2012-07-18 12:36:14 -07:00
Joakim Erdfelt fae2e0d48e No longer need to flip output of Generator.generate() 2012-07-18 12:23:04 -07:00
Joakim Erdfelt f8e72803a6 Fixing expectations in unit tests 2012-07-18 12:22:16 -07:00
Jesse McConnell 960491cc64 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-18 14:01:42 -05:00
Joakim Erdfelt 964fa9325a Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-18 11:51:38 -07:00
Joakim Erdfelt 0060a32bc5 Adding test of windows generator with masking 2012-07-18 11:51:22 -07:00
Joakim Erdfelt 58e181f463 Making Generator and WebSocketFrame collaborate to allow for windowed buffer creation 2012-07-18 11:36:30 -07:00
Simone Bordet ebb7806edc Jetty9 - Implemented abstract methods on SelectorManager that were always implemented in the same way, making them consistent. 2012-07-18 19:47:10 +02:00
Joakim Erdfelt 51e77c93f3 Adding testcase for windowed Generator 2012-07-18 09:44:55 -07:00
Joakim Erdfelt 6350470e3f Coming to grips with windowed write 2012-07-18 09:36:16 -07:00
Jesse McConnell c0e80e6ff9 comments on the generate() method 2012-07-18 10:54:00 -05:00
Joakim Erdfelt 99e7b9becc Fixing mid-message ping/pong support 2012-07-17 11:50:53 -07:00
Joakim Erdfelt 4aa54d244a Working out some fallout of the Session split 2012-07-17 11:20:18 -07:00
Joakim Erdfelt 6ece593c58 Fixing expectations of internal impl now that WebSocketSession exists 2012-07-17 10:15:11 -07:00
Joakim Erdfelt 249595882c Wiring up extension chain on server side 2012-07-17 10:09:25 -07:00
Joakim Erdfelt c84df9bf2b Adding test suite for quick testing 2012-07-16 16:08:00 -07:00
Joakim Erdfelt 6c0e24485a Splitting out new WebSocketSession from WebSocketAsyncConnection to better support extensions (see diagrams) 2012-07-16 15:49:12 -07:00
Joakim Erdfelt 10eeb3f6cf Fixing typo [1] 2012-07-16 12:04:43 -07:00
Joakim Erdfelt 851b53ec3a Adding diagrams to javadoc about communications stack (and extensions) 2012-07-16 11:58:27 -07:00
Jesse McConnell 136514948f [maven-release-plugin] prepare for next development iteration 2012-07-16 13:24:49 -05:00
Jesse McConnell 1bbc677a09 [maven-release-plugin] prepare release jetty-8.1.5.v20120716 2012-07-16 13:24:42 -05:00
Jesse McConnell f755d014cd [maven-release-plugin] prepare for next development iteration 2012-07-16 13:23:59 -05:00
Jesse McConnell 04b7e807a0 [maven-release-plugin] prepare release jetty-7.6.5.v20120716 2012-07-16 13:23:53 -05:00
Jesse McConnell c00bb2d6ca reset for release 2012-07-16 12:55:22 -05:00
Jesse McConnell f59b2a0632 reset release 2012-07-16 12:54:36 -05:00
Joakim Erdfelt 1381ee4eeb Adding copy constructor 2012-07-16 09:55:00 -07:00
Joakim Erdfelt 1cf2035580 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-16 09:32:38 -07:00
Joakim Erdfelt 5bf71f5125 Support reponse forbidden better 2012-07-16 09:32:25 -07:00
Jesse McConnell 205e8f74f0 [maven-release-plugin] prepare for next development iteration 2012-07-13 10:20:48 -05:00
Jesse McConnell c3b5269d60 [maven-release-plugin] prepare release jetty-8.1.5.v20120713 2012-07-13 10:20:23 -05:00
Jesse McConnell 12ecc10c6a [maven-release-plugin] prepare for next development iteration 2012-07-13 09:35:08 -05:00
Jesse McConnell bf40110fb8 [maven-release-plugin] prepare release jetty-7.6.5.v20120713 2012-07-13 09:34:52 -05:00
Greg Wilkins acbf20af27 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
Conflicts:
	jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java
2012-07-13 22:59:05 +10:00
Greg Wilkins e70df19248 jetty-9 progress on more unit tests 2012-07-13 22:55:40 +10:00
Joakim Erdfelt fc658c3805 Fixing NPE 2012-07-12 11:29:40 -07:00
Joakim Erdfelt b0549d8bf9 Introducing IncomingFrames and OutgoingFrames interfaces for everything to use, including Extensions 2012-07-12 11:21:35 -07:00
Joakim Erdfelt f4c0b376d6 Removing discouraged form of Generator constructor 2012-07-11 13:08:02 -07:00
Jesse McConnell 81d72052c8 merged master to jetty-8 2012-07-11 14:04:49 -05:00
Joakim Erdfelt 03fa76d333 Adding more TODOs 2012-07-11 12:01:02 -07:00
Joakim Erdfelt be0c372cad Moving Parser and Generator into .protocol. package 2012-07-11 11:59:03 -07:00
Joakim Erdfelt 9986f43272 Fixing license headers 2012-07-11 11:57:31 -07:00
Joakim Erdfelt d3a7ddbef0 Fixing license headers 2012-07-11 11:53:19 -07:00
Joakim Erdfelt d7f3bbb260 Fixing build issue 2012-07-11 11:43:12 -07:00
Joakim Erdfelt 6757160a94 Starting to piece together the Extensions 2012-07-11 11:42:26 -07:00
Jesse McConnell aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Joakim Erdfelt 0d1fee5906 Making BlockHeadClient timeouts more sane 2012-07-11 09:53:18 -07:00
Joakim Erdfelt d3b599d67c Attempting to get timeouts working 2012-07-11 09:47:10 -07:00
Joakim Erdfelt c8821605fe Fixing fill interested 2012-07-11 09:33:58 -07:00
Jesse McConnell 0fa17c13b1 Merge branch 'master' into jetty-8 2012-07-11 10:10:00 -05:00
Joakim Erdfelt 3ab8a0e5b7 Adding support to detect bad UTF-8 text message 2012-07-10 15:03:47 -07:00
Joakim Erdfelt 8aa6e5db9b Fixing WebSocketAsyncConnection.write() of byte[] arrays 2012-07-10 14:45:37 -07:00
Joakim Erdfelt 4fd7ff76fb Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 14:34:05 -07:00
Joakim Erdfelt eb07c173ca Fixing some server tests 2012-07-10 14:33:50 -07:00
Jesse McConnell c0b1261c2b come back from parseFrame in order to notify 2012-07-10 16:32:57 -05:00
Joakim Erdfelt 5d796488e2 Fixing logging format specifier bug 2012-07-10 14:07:04 -07:00
Joakim Erdfelt 1f25e9cee1 Setting client tests to @Ignore 2012-07-10 14:03:11 -07:00
Joakim Erdfelt 23ecb2e29c Fixing build 2012-07-10 13:44:09 -07:00
Joakim Erdfelt 6f52b23735 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 13:41:56 -07:00
Joakim Erdfelt 2f5c40bbf9 Making changes for WebSocketFrame builder 2012-07-10 13:41:50 -07:00
Jesse McConnell ea68a3de83 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 15:36:09 -05:00
Jesse McConnell bc4086491b merge frame parser and actual parser 2012-07-10 15:35:51 -05:00
Joakim Erdfelt e5883607ce Adding scheduler to factory 2012-07-10 12:33:41 -07:00
Jesse McConnell 3ede05e134 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 14:25:35 -05:00
Jesse McConnell 9488507919 updated unit tests 2012-07-10 14:25:16 -05:00
Joakim Erdfelt 95e540fd27 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 12:20:50 -07:00
Joakim Erdfelt 3d39d0a916 Updating tests for WebSocketFrame 2012-07-10 12:20:40 -07:00
Jesse McConnell d358847d5e updated unit tests 2012-07-10 14:20:26 -05:00
Jesse McConnell b3d7dd4f1b adding constructors 2012-07-10 14:17:57 -05:00
Joakim Erdfelt 8d583045b3 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 12:16:58 -07:00
Joakim Erdfelt ef69b22815 Fixing WebSocketFrame.setPayload(byte[]) bug, updating more tests 2012-07-10 12:16:47 -07:00
Jesse McConnell 4fed53ce85 test improvement 2012-07-10 14:13:09 -05:00
Joakim Erdfelt b46ba628cd Adding UnitGenerator and migrating more tests cases to WebSocketFrame 2012-07-10 12:05:03 -07:00
Joakim Erdfelt f97d86894a Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 11:53:19 -07:00
Joakim Erdfelt cd0edafa68 Fixing build issue 2012-07-10 11:53:10 -07:00
Jesse McConnell 8c6820a812 update to use latest changes on frame 2012-07-10 13:52:27 -05:00
Joakim Erdfelt d6139b8978 Adding convenience statics to WebSocketFrame (useful stuff from FrameBuilder) 2012-07-10 11:48:53 -07:00
Joakim Erdfelt caf693488a Removing FrameBuilder 2012-07-10 11:44:17 -07:00
Joakim Erdfelt c2f1d23f2b Making WebSocketFrame use builder pattern 2012-07-10 11:12:10 -07:00
Joakim Erdfelt 20876011e0 Working in FrameBytes queue and timeout task 2012-07-10 10:41:47 -07:00
Joakim Erdfelt 8de2cc6805 Fixing parser 2012-07-10 10:19:38 -07:00
Jesse McConnell 9d2968d781 null check on payload 2012-07-10 08:55:15 -05:00
Jesse McConnell 3754f9e04c most tests compiling again 2012-07-10 08:53:10 -05:00
Jesse McConnell dc3ad1f3d5 clean up aftereffects of byte[] -> ByteBuffer switch in WebSocketFrame internals 2012-07-10 08:33:19 -05:00
Joakim Erdfelt 057acfd665 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-09 16:37:00 -07:00
Joakim Erdfelt 85b5d3456f More work to flesh out the FrameBytes concept from SPDY within the scope of WebSocket with an eye on physical vs virtual connections 2012-07-09 16:36:54 -07:00
Joakim Erdfelt 5f6d7ec596 Refactoring out the byte[] array in favor of ByteBuffer in frame (to reduce number of data copies) 2012-07-09 15:26:05 -07:00
Jesse McConnell 4a1f50c7a6 switch generator to use bytebuffer again and wire pool back in, update frame builder to use static internal pool for time being, remove FrameGenerator 2012-07-09 17:20:58 -05:00
Joakim Erdfelt 3ae9548c43 Another review refact (in progress) 2012-07-09 14:42:59 -07:00
Joakim Erdfelt 6a0e3f6c72 Moving old tests to new structure 2012-07-09 09:32:37 -07:00
Joakim Erdfelt c4029ba5df Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 15:53:56 -07:00
Joakim Erdfelt 7a35ea9c75 Moving more tests cases over 2012-07-06 15:53:41 -07:00
Jesse McConnell db83405218 add comments re: rfc6455 for frame generator validation 2012-07-06 17:41:54 -05:00
Jesse McConnell 3797508f8e switched method to add reason 2012-07-06 17:29:58 -05:00
Jesse McConnell b4cf61bc7d Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 17:26:02 -05:00
Jesse McConnell 889a471420 rejigger frame builder to use the generator and pull generator validation logic into assertFrameValid method 2012-07-06 17:25:58 -05:00
Joakim Erdfelt 5d9eab45b4 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 15:09:27 -07:00
Jesse McConnell 27b05ccd6e fix protocol exception regarding control frames and FIN=false 2012-07-06 17:09:05 -05:00
Joakim Erdfelt 87ca4eb25b Fixing build issues 2012-07-06 15:09:03 -07:00
Joakim Erdfelt c24b7d83e6 Fixing close handling 2012-07-06 15:03:07 -07:00
Joakim Erdfelt 137c6c3f2e Removing ByteBufferAssert 2012-07-06 14:55:03 -07:00
Joakim Erdfelt 3e24e8290f Minor fix of logging 2012-07-06 14:52:44 -07:00
Jesse McConnell 8b6ec0194b Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 16:48:50 -05:00
Jesse McConnell b2cdc2bdb0 update test 2012-07-06 16:48:39 -05:00
Joakim Erdfelt 2af10cebab Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 14:46:16 -07:00
Joakim Erdfelt d20b277924 Fixing test case build error 2012-07-06 14:46:05 -07:00
Joakim Erdfelt 8a43e2c6fc Fixing test case build error 2012-07-06 14:45:09 -07:00
Jesse McConnell 3bebb2e0a4 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 16:45:05 -05:00
Jesse McConnell af42702a27 update test 2012-07-06 16:45:00 -05:00
Joakim Erdfelt cd27d7bf29 Removing CloseUtil in favor of CloseInfo 2012-07-06 14:37:57 -07:00
Joakim Erdfelt cefeab8a65 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 14:36:14 -07:00
Joakim Erdfelt f52c28f128 Fixing last of the test failures 2012-07-06 14:35:46 -07:00
Jesse McConnell 44f0253bdb add warning to frame builder 2012-07-06 16:33:14 -05:00
Joakim Erdfelt f21f0433e0 Fixing AB2.5 2012-07-06 14:23:39 -07:00
Joakim Erdfelt e29b372604 Trying to fix AB2.5 2012-07-06 14:15:50 -07:00
Joakim Erdfelt 48a8077723 Fixing large frame test 2012-07-06 14:07:05 -07:00
Joakim Erdfelt 1a55c2fa44 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 14:06:08 -07:00
Joakim Erdfelt f1be381866 Fixing policy 2012-07-06 14:05:58 -07:00
Jesse McConnell 7f102e7204 fixed test 2012-07-06 16:03:48 -05:00
Joakim Erdfelt 2f3937687d Fixing EMPTY payload parsing issue 2012-07-06 14:01:35 -07:00
Jesse McConnell fc8198e854 fixing a test issue 2012-07-06 15:56:04 -05:00
Jesse McConnell c7cff443be fixing a test issue 2012-07-06 15:55:09 -05:00
Joakim Erdfelt b39a6a6f59 Fixing more tests 2012-07-06 13:49:47 -07:00
Joakim Erdfelt 071f15e0c9 Fixing tests 2012-07-06 13:43:42 -07:00
Joakim Erdfelt cbfe922fe1 Fixing build errors 2012-07-06 13:40:23 -07:00
Joakim Erdfelt a5424e65e3 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 13:37:25 -07:00
Joakim Erdfelt eb9a6ecbfb Fixing more parser tests 2012-07-06 13:37:11 -07:00
Jesse McConnell c814772fc0 reorder tests 2012-07-06 15:33:39 -05:00
Jesse McConnell eed8db7340 updates to unit tests 2012-07-06 15:28:46 -05:00
Joakim Erdfelt 8d0d3adcf9 Fixing FrameBuilder (and test) 2012-07-06 13:25:55 -07:00
Joakim Erdfelt 97cf0e37a9 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 13:21:15 -07:00
Joakim Erdfelt 557de7b708 Fixing more tests 2012-07-06 13:16:21 -07:00
Jesse McConnell 285701f98e Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 15:16:19 -05:00
Jesse McConnell 5973335f28 frame builder length test 2012-07-06 15:15:59 -05:00
Joakim Erdfelt 6e2c45fa47 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 13:08:11 -07:00
Joakim Erdfelt 4d020de810 Fixing parser 2012-07-06 13:07:58 -07:00
Jesse McConnell 79a1de1ad9 udpated binary tests 2012-07-06 14:41:49 -05:00
Jesse McConnell 854e056772 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 14:11:44 -05:00
Jesse McConnell 85982199e7 parsing tests showing issue 2012-07-06 14:11:33 -05:00
Joakim Erdfelt 3c8206e6bf Adding CloseInfo (to replace CloseUtil) 2012-07-06 12:11:27 -07:00
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