Commit Graph

205 Commits

Author SHA1 Message Date
Simone Bordet 6e9567d410 jetty-9 - Using longer timeouts when expecting results. 2012-09-17 21:49:18 +02:00
Simone Bordet 92c95584fa jetty-9 - Set default timeout for expect() to be 5 s. 2012-09-17 21:49:18 +02:00
Greg Wilkins 129583679a jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector 2012-09-17 17:37:56 +10:00
Joakim Erdfelt 5ebc784b45 cleaning up test logging output 2012-09-14 14:41:03 -07:00
Joakim Erdfelt c7404731c9 Starting removal of WebSocketPolicy.getBufferSize() 2012-09-14 10:41:11 -07:00
Simone Bordet 7231c82b69 Merged branch 'jetty-9' into jetty-9-client. 2012-09-06 08:41:48 +02:00
Joakim Erdfelt 4f36513744 More work around close handshake testing 2012-09-04 14:53:34 -07:00
Greg Wilkins c3776764f4 jetty-9 ConcurrentScheduler refinements 2012-09-03 15:24:36 +10:00
Greg Wilkins 83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +10:00
Greg Wilkins cb5dd493fb jetty-9 merged jetty-9-aggregation 2012-08-27 10:24:34 +10:00
Greg Wilkins 726898ffd8 jetty-9 fixed after merged 2012-08-24 20:39:03 +10:00
Simone Bordet 171ad66962 Fixed compilation errors after merging branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 12:20:44 +02:00
Simone Bordet 06b2de17d5 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 11:52:29 +02:00
Simone Bordet dc140f85b7 Jetty9 - Refactored HttpChannel: moved connection logic back to HttpConnection. 2012-08-21 15:09:54 +02:00
Jesse McConnell 6ffaa478c4 standardize license headers 2012-08-17 16:09:49 -05:00
Joakim Erdfelt 6311976e86 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-17 13:48:22 -07:00
Joakim Erdfelt b36b41afd7 Fixing websocket-client upgrade connection -> websocket connection handling 2012-08-17 13:48:04 -07:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Simone Bordet 136f7924fd Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle. 2012-08-10 19:02:16 +02:00
Joakim Erdfelt b37da5a5da Making payload fast-fail and demasking work together in peace and harmony 2012-08-09 13:17:07 -07:00
Greg Wilkins 03ebcc881c jetty-9 include more modules 2012-08-09 19:31:50 +10:00
Joakim Erdfelt 889d20ba55 Removing throws IOException on WSConnection.close() 2012-08-08 12:42:57 -07:00
Joakim Erdfelt 1a62c5ded6 Fixing websocket example to use creator 2012-08-08 08:31:44 -07:00
Greg Wilkins 9c9668b112 ported websocketchat to new API 2012-08-08 16:08:47 +10:00
Greg Wilkins 32c5f6c093 jetty-9 reduced LazyList usage 2012-08-08 11:58:50 +10:00
Joakim Erdfelt d76a5ce80e Fixing testcase 7.5.1 (bad utf8 close reason) handling 2012-08-07 09:53:33 -07:00
Joakim Erdfelt 365f4d8448 Adding TestABCase9 with @Stress enabled 2012-08-06 13:55:55 -07:00
Joakim Erdfelt b8fc39a53e Adding the AB7 close test cases 2012-08-06 10:18:16 -07:00
Joakim Erdfelt e04bb3128c Refactoring out the basic good/bad UTF tests from TestABCase6 into separate parameterized test cases 2012-08-06 08:36:41 -07:00
Joakim Erdfelt 33270eced5 More valid UTF8 text payload edge cases 2012-08-03 12:49:03 -07:00
Joakim Erdfelt a6d88f0d0f Adding more Invalid UTF8 text payload tests 2012-08-03 12:35:16 -07:00
Joakim Erdfelt 951b669ba9 Adding more UTF8 text payload tests 2012-08-03 12:00:10 -07:00
Simone Bordet e3132d41d8 Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 18:35:34 +02:00
Greg Wilkins 5e6cd1b27f Merge branch 'jetty-9' into jetty-9-oneconnector
Conflicts:
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
	jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
2012-08-03 08:48:34 +10:00
Greg Wilkins 962a0d0889 jetty-9 ensure injected threadpool is managed 2012-08-03 08:44:49 +10:00
Joakim Erdfelt 9b49e889dd Fixing big buffer flush issue (thanks simone) 2012-08-02 15:25:18 -07:00
Greg Wilkins f6d84d9f91 Merge branch 'jetty-9' into jetty-9-oneconnector 2012-08-03 06:33:26 +10:00
Joakim Erdfelt 000657ddb5 Fixing various Parser bugs identified by test cases
+ Mask bytes were read backwards during slow parse
+ Bad continuation frame detection added
+ Bad fragmented data frame detection added
+ Correcting WebSocketFrame copy constructor and FIN bit
2012-08-02 13:02:54 -07:00
Joakim Erdfelt e2dd62a3af Trying to work out masking issue with parser 2012-08-02 10:13:07 -07:00
Joakim Erdfelt a638bbb850 Trying to work out why masking occasionally barfs 2012-08-02 09:53:13 -07:00
Greg Wilkins 0865a9cfb0 jetty-9 removed more AsyncConnection names 2012-08-02 18:10:29 +10:00
Greg Wilkins b63e09df61 jetty-9 rudimentary connectionFactory impl 2012-08-02 17:44:29 +10:00
Greg Wilkins b52930be14 jetty-9 merged Async and non-Async classes for EndPoint and Connection 2012-08-02 16:08:49 +10:00
Greg Wilkins a4da8f2323 Merge branch 'jetty-9' into jetty-9-oneconnector 2012-08-02 14:18:38 +10:00
Joakim Erdfelt a8a3bade33 Setting @Ignore on tests with issues ATM 2012-08-01 19:45:14 -07:00
Greg Wilkins 96b5c05674 jetty-9 one connector passing most tests 2012-08-02 11:51:54 +10:00
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 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 b3db5ffc8d Fixing websocket-server tests 2012-07-25 11:49:04 -07:00
Simone Bordet d2a0cb5c50 Jetty9 - Fixed compilation problems. 2012-07-23 15:38:27 +02:00
Joakim Erdfelt 4af5a10b29 Working out bug in client parsing of lots of messages 2012-07-19 14:10:07 -07: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 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 249595882c Wiring up extension chain on server side 2012-07-17 10:09:25 -07:00
Joakim Erdfelt 5bf71f5125 Support reponse forbidden better 2012-07-16 09:32:25 -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 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 6757160a94 Starting to piece together the Extensions 2012-07-11 11:42:26 -07: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 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 eb07c173ca Fixing some server tests 2012-07-10 14:33:50 -07:00
Joakim Erdfelt 2f5c40bbf9 Making changes for WebSocketFrame builder 2012-07-10 13:41:50 -07:00
Joakim Erdfelt e5883607ce Adding scheduler to factory 2012-07-10 12:33:41 -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 3797508f8e switched method to add reason 2012-07-06 17:29:58 -05: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 af42702a27 update test 2012-07-06 16:45:00 -05: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
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