Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,738 Commits 75 Branches 465 Tags 370 MiB
Commit Graph

619 Commits

Author SHA1 Message Date
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
Greg Wilkins 03525bfe46 jetty-9 javadoc and code cleanups 2012-03-08 15:18:17 +11: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
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
Joakim Erdfelt 93ebd1dbe5 Using straight Socket as HttpURLConnection request header modifications are not reliable enough for testing purposes 2011-12-19 13:06:54 -07:00
Joakim Erdfelt 95f763fab4 Bug 367099 - Upgrade jetty-websocket for RFC 6455 
+ Adding new RFC declared close codes 1011 (CLOSE_SERVER_ERROR) and
  1015 (CLOSE_FAILED_TLS_HANDSHAKE)
+ Adding support for responding as CLOSE_SERVER_ERROR if an unhandled
  exception (similar to how HTTP error 500 works) but for exceptions
  thrown out of implementations of WebSocket.
+ Adding guard to prevent use of CLOSE_FAILED_TLS_HANDSHAKE on
  close control frame.
+ Adding unit test for the CLOSE_SERVER_ERROR case.
+ Adding unit test for HTTP response 400 on bad Sec-WebSocket-Version
  request header value.
 2011-12-19 12:29:15 -07:00
Joakim Erdfelt 874a6502f4 Adding missing license headers. 2011-12-19 10:06:58 -07:00
Joakim Erdfelt 6d907fa61d Bug 367099 - Upgrade jetty-websocket for RFC 6455 
+ Renaming *D13 classes to *RFC6455 per dicussion in jetty-dev mailing
list
 2011-12-19 10:03:01 -07:00
Simone Bordet 3e05c1e59d Merged from origin/master. 2011-12-16 21:30:45 +01:00