e70df19248
jetty-9 progress on more unit tests
2012-07-13 22:55:40 +10:00
fc658c3805
Fixing NPE
2012-07-12 11:29:40 -07:00
b0549d8bf9
Introducing IncomingFrames and OutgoingFrames interfaces for everything to use, including Extensions
2012-07-12 11:21:35 -07:00
f4c0b376d6
Removing discouraged form of Generator constructor
2012-07-11 13:08:02 -07:00
81d72052c8
merged master to jetty-8
2012-07-11 14:04:49 -05:00
03fa76d333
Adding more TODOs
2012-07-11 12:01:02 -07:00
be0c372cad
Moving Parser and Generator into .protocol. package
2012-07-11 11:59:03 -07:00
9986f43272
Fixing license headers
2012-07-11 11:57:31 -07:00
d3a7ddbef0
Fixing license headers
2012-07-11 11:53:19 -07:00
d7f3bbb260
Fixing build issue
2012-07-11 11:43:12 -07:00
6757160a94
Starting to piece together the Extensions
2012-07-11 11:42:26 -07:00
aa941f5711
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:29:46 -05:00
0d1fee5906
Making BlockHeadClient timeouts more sane
2012-07-11 09:53:18 -07:00
d3b599d67c
Attempting to get timeouts working
2012-07-11 09:47:10 -07:00
c8821605fe
Fixing fill interested
2012-07-11 09:33:58 -07:00
0fa17c13b1
Merge branch 'master' into jetty-8
2012-07-11 10:10:00 -05:00
3ab8a0e5b7
Adding support to detect bad UTF-8 text message
2012-07-10 15:03:47 -07:00
8aa6e5db9b
Fixing WebSocketAsyncConnection.write() of byte[] arrays
2012-07-10 14:45:37 -07:00
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
eb07c173ca
Fixing some server tests
2012-07-10 14:33:50 -07:00
c0b1261c2b
come back from parseFrame in order to notify
2012-07-10 16:32:57 -05:00
5d796488e2
Fixing logging format specifier bug
2012-07-10 14:07:04 -07:00
1f25e9cee1
Setting client tests to @Ignore
2012-07-10 14:03:11 -07:00
23ecb2e29c
Fixing build
2012-07-10 13:44:09 -07:00
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
2f5c40bbf9
Making changes for WebSocketFrame builder
2012-07-10 13:41:50 -07:00
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
bc4086491b
merge frame parser and actual parser
2012-07-10 15:35:51 -05:00
e5883607ce
Adding scheduler to factory
2012-07-10 12:33:41 -07:00
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
9488507919
updated unit tests
2012-07-10 14:25:16 -05:00
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
3d39d0a916
Updating tests for WebSocketFrame
2012-07-10 12:20:40 -07:00
d358847d5e
updated unit tests
2012-07-10 14:20:26 -05:00
b3d7dd4f1b
adding constructors
2012-07-10 14:17:57 -05:00
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
ef69b22815
Fixing WebSocketFrame.setPayload(byte[]) bug, updating more tests
2012-07-10 12:16:47 -07:00
4fed53ce85
test improvement
2012-07-10 14:13:09 -05:00
b46ba628cd
Adding UnitGenerator and migrating more tests cases to WebSocketFrame
2012-07-10 12:05:03 -07:00
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
cd0edafa68
Fixing build issue
2012-07-10 11:53:10 -07:00
8c6820a812
update to use latest changes on frame
2012-07-10 13:52:27 -05:00
d6139b8978
Adding convenience statics to WebSocketFrame (useful stuff from FrameBuilder)
2012-07-10 11:48:53 -07:00
caf693488a
Removing FrameBuilder
2012-07-10 11:44:17 -07:00
c2f1d23f2b
Making WebSocketFrame use builder pattern
2012-07-10 11:12:10 -07:00
20876011e0
Working in FrameBytes queue and timeout task
2012-07-10 10:41:47 -07:00
8de2cc6805
Fixing parser
2012-07-10 10:19:38 -07:00
9d2968d781
null check on payload
2012-07-10 08:55:15 -05:00
3754f9e04c
most tests compiling again
2012-07-10 08:53:10 -05:00
dc3ad1f3d5
clean up aftereffects of byte[] -> ByteBuffer switch in WebSocketFrame internals
2012-07-10 08:33:19 -05:00
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
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
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
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
3ae9548c43
Another review refact (in progress)
2012-07-09 14:42:59 -07:00
6a0e3f6c72
Moving old tests to new structure
2012-07-09 09:32:37 -07:00
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
7a35ea9c75
Moving more tests cases over
2012-07-06 15:53:41 -07:00
db83405218
add comments re: rfc6455 for frame generator validation
2012-07-06 17:41:54 -05:00
3797508f8e
switched method to add reason
2012-07-06 17:29:58 -05:00
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
889a471420
rejigger frame builder to use the generator and pull generator validation logic into assertFrameValid method
2012-07-06 17:25:58 -05:00
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
27b05ccd6e
fix protocol exception regarding control frames and FIN=false
2012-07-06 17:09:05 -05:00
87ca4eb25b
Fixing build issues
2012-07-06 15:09:03 -07:00
c24b7d83e6
Fixing close handling
2012-07-06 15:03:07 -07:00
137c6c3f2e
Removing ByteBufferAssert
2012-07-06 14:55:03 -07:00
3e24e8290f
Minor fix of logging
2012-07-06 14:52:44 -07:00
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
b2cdc2bdb0
update test
2012-07-06 16:48:39 -05:00
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
d20b277924
Fixing test case build error
2012-07-06 14:46:05 -07:00
8a43e2c6fc
Fixing test case build error
2012-07-06 14:45:09 -07:00
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
af42702a27
update test
2012-07-06 16:45:00 -05:00
cd27d7bf29
Removing CloseUtil in favor of CloseInfo
2012-07-06 14:37:57 -07:00
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
f52c28f128
Fixing last of the test failures
2012-07-06 14:35:46 -07:00
44f0253bdb
add warning to frame builder
2012-07-06 16:33:14 -05:00
f21f0433e0
Fixing AB2.5
2012-07-06 14:23:39 -07:00
e29b372604
Trying to fix AB2.5
2012-07-06 14:15:50 -07:00
48a8077723
Fixing large frame test
2012-07-06 14:07:05 -07:00
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
f1be381866
Fixing policy
2012-07-06 14:05:58 -07:00
7f102e7204
fixed test
2012-07-06 16:03:48 -05:00
2f3937687d
Fixing EMPTY payload parsing issue
2012-07-06 14:01:35 -07:00
fc8198e854
fixing a test issue
2012-07-06 15:56:04 -05:00
c7cff443be
fixing a test issue
2012-07-06 15:55:09 -05:00
b39a6a6f59
Fixing more tests
2012-07-06 13:49:47 -07:00
071f15e0c9
Fixing tests
2012-07-06 13:43:42 -07:00
cbfe922fe1
Fixing build errors
2012-07-06 13:40:23 -07:00
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
eb9a6ecbfb
Fixing more parser tests
2012-07-06 13:37:11 -07:00
c814772fc0
reorder tests
2012-07-06 15:33:39 -05:00
eed8db7340
updates to unit tests
2012-07-06 15:28:46 -05:00
8d0d3adcf9
Fixing FrameBuilder (and test)
2012-07-06 13:25:55 -07:00
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
557de7b708
Fixing more tests
2012-07-06 13:16:21 -07:00
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
5973335f28
frame builder length test
2012-07-06 15:15:59 -05:00
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
4d020de810
Fixing parser
2012-07-06 13:07:58 -07:00
79a1de1ad9
udpated binary tests
2012-07-06 14:41:49 -05:00
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
85982199e7
parsing tests showing issue
2012-07-06 14:11:33 -05:00
3c8206e6bf
Adding CloseInfo (to replace CloseUtil)
2012-07-06 12:11:27 -07:00
c1f4dbbfec
Replacing WebSocketFrame.ByteBuffer with byte[] array
2012-07-06 11:58:45 -07:00
c2872ff556
Renaming .frames.BaseFrame to .protocols.WebSocketFrame
2012-07-06 11:33:26 -07:00
dfc9315bc7
Next step in simplifying the frames
2012-07-06 11:32:22 -07:00
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
3bd5ad1746
adding close util
2012-07-06 13:00:20 -05:00
521e9371a6
Removing javadoc links to frame classes (being removed)
2012-07-06 10:55:53 -07:00
100d1ee5d5
merge
2012-07-06 12:25:32 -05:00
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
70ff05e955
WebSocketAsyncConnection.write() with byte[] array fails occasionally
2012-07-06 10:22:41 -07:00
84fa1163e9
Fixing write of byte buffer
2012-07-06 10:06:05 -07:00
ae56940796
Moving more tests to new structure
2012-07-06 09:47:11 -07:00
4fadeb6b4a
Reenabling message echo
2012-07-06 09:46:53 -07:00
4e6a3dd2fd
Making BlockheadClient a bit more friendly for debugging
2012-07-06 09:46:30 -07:00
2fca248352
Fixing clearToFill bug
2012-07-06 09:45:24 -07:00
03443cd237
Making debug on generator a bit more useful
2012-07-06 09:45:13 -07:00
9129130a0b
Allowing .setPayload() with byte arrays in BaseFrame
2012-07-06 09:44:49 -07:00
89d6e8ddbf
Fixing compile issues
2012-07-06 08:49:30 -07:00
4f30fe2a40
Fleshing out WebSocketPing impl
2012-07-06 08:44:56 -07:00
3b2aa4c45e
Moving ExtensionConfig into .protocol. package
2012-07-06 08:43:36 -07:00
cd46dc3cee
More cleanup of websocket-server
2012-07-05 17:07:56 -07:00
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
8fa35533b6
Moving ExtensionConfig out of .api and into .extensions where it belongs
2012-07-05 16:29:14 -07:00
11280ca22d
Moving packages around, cleaning up the test cases structure too
2012-07-05 16:27:45 -07:00
fa023ebc6c
Integrating the new Frame interface
2012-07-05 16:14:57 -07:00
46452b9c7a
Adding beginnings of Streaming support in WebSocketEventDriver
2012-07-05 16:11:11 -07:00
d163fb4414
Updating EventMethodsCache (and tests) for new OnWebSocketMessage annotation
2012-07-05 15:04:20 -07:00
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
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
1529baea92
Start of refactor from dev community discussion
2012-07-05 12:20:51 -07:00
2b4bf3ef26
jetty-9 moved connection upgrade support to HttpConnection completed
2012-07-04 14:19:38 +02:00
05f9ba8244
jetty-9 moved connection upgrade support to HttpConnection completed
2012-07-04 14:17:41 +02:00
db8d5089e8
383881 WebSocketHandler sets request as handled
2012-07-04 10:50:47 +02:00
3df516779b
Adding policy maxPayloadSize and autoFragmentSize
2012-07-03 16:13:44 -07:00
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
4549afbcf0
Setting SSL tests to @Ignore (till we implement the SSL bits again)
2012-07-03 11:56:27 -07:00
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
d815a9c7d2
Fixing more build related issues
2012-07-03 11:53:46 -07:00
96dc53e496
commiting ignored case til we support streaming
2012-07-03 13:44:49 -05:00
c97c22d6d6
Fixing compilation issues
2012-07-03 11:42:11 -07:00
d70174f159
Cleaning up all of the old uncompilable websocket source
2012-07-03 11:31:16 -07:00
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
f27fff4902
Initial work on websocket-client using SPDY as example
2012-07-02 15:59:35 -07:00
46da5fe5e2
couple more test cases and fixed fragmented control frame response
2012-07-02 17:23:16 -05:00
2d5fa0a3bc
close short to int
2012-07-02 16:06:43 -05:00
40faff2ab7
Adding TODOs from review discussion
2012-07-02 10:39:20 -07:00
63ead191bf
Using connector.getByteBufferPool() vs creating a new pool per WebSocketAsyncConnection
2012-07-02 08:54:42 -07:00
beca3f9bd0
Renaming AsyncWebSocketConnection to WebSocketAsyncConnection per discussion
2012-07-02 08:51:37 -07:00
e60001fab8
Fixing exception expectation on testcase
2012-07-02 07:49:34 -07:00
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
990eba7ef4
Fixing javadoc
2012-07-02 07:12:31 -07:00
39d8cd1b27
Overhauling CloseException to terminate the connection when encountered
2012-06-29 15:56:08 -07:00
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
0a301b153e
Adding ability to issue close(SERVER_ERROR) on unhandled exception during parse/notify flows
2012-06-29 15:12:05 -07:00
e86a3a400e
connection cased invalid status code response tests
2012-06-29 17:10:19 -05:00
3fa89ea577
Fixing buffer flip logic
2012-06-29 13:00:08 -07:00
ce90b8581b
shorthand notation for g and p
2012-06-29 14:30:50 -05:00
1899a938d0
some generator debug logging
2012-06-29 14:26:33 -05:00
e47c47f071
Fixing endpoint.fillInterested() missing piece
2012-06-29 12:11:00 -07:00
9011b0713d
Adding more logging
2012-06-29 12:05:15 -07:00
564e56b223
Merge
2012-06-29 11:57:11 -07:00
b748ff0bea
Fixing src/test/resources mistakes
2012-06-29 11:56:22 -07:00
81372c2b7d
cleaner generator toString()
2012-06-29 13:55:36 -05:00
1a56a63045
Fixing src/test/resources mistakes
2012-06-29 11:37:07 -07:00
042dc41998
Making construction of TextFrame start with FIN=true
2012-06-29 11:29:03 -07:00
cd3c47ef0e
Attempting to get AsyncWebSocketConnection to actually get a onFillable() call
2012-06-29 11:04:38 -07:00
f28324e31a
Initial pass at BlockheadClient and SimpleServletServer to aid in unit testing
2012-06-29 10:08:10 -07:00
9de009c1b2
Fixing failed upgrade due to invalid request websocket version
2012-06-29 09:12:59 -07:00
e30e5976b4
Fixing failed upgrade due to invalid request websocket version
2012-06-29 09:12:55 -07:00
57acc891ac
Removing Debug class in favor of just using src/test/java/jetty-logging.properties
2012-06-29 09:09:14 -07:00
9b2aee45ad
removing tests that in hindsight ought to be connection level and not parser/generator level
2012-06-29 08:13:59 -05:00
acabb0a2da
additional close frame testing
2012-06-29 07:51:19 -05:00
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
f56b2acd8d
Removing old WebSocket interface API and fixing build failures as result
2012-06-28 15:30:29 -07:00
d2561acde4
Fleshing out the write methods on AsyncWebSocketConnection
2012-06-28 15:07:39 -07:00
256dec3e91
Adding more test cases for WebSocketEventDriver
2012-06-28 14:41:57 -07:00
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
153daf4f3b
tossing exceptions on a couple more edgecases and additional tests on close
2012-06-28 16:32:50 -05:00
70b9f7245e
ByteBuffer vs byte[] array tests
2012-06-28 14:27:51 -07:00
9cd2f887d1
Making assert more sane
2012-06-28 14:10:04 -07:00
daf3fa4ddf
Cleaning up logging
2012-06-28 14:09:52 -07:00
03d37b58f2
switch from short to char to sidestep short java signage
2012-06-28 16:06:39 -05:00
2c16fe552f
Fixing close frame stuff
2012-06-28 14:05:13 -07:00
787a87468f
Reworking CloseFrame and ClosePayloadParser due to discoveries during testing
2012-06-28 13:52:48 -07:00
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
65166e6cc6
annoying hack around close frame logic for parser and generator
2012-06-28 14:50:36 -05:00
9b31c35f15
Fixing up (byte[],int,int) vs (ByteBuffer) approaches on events
2012-06-28 12:49:59 -07:00
deef1a3ac1
First pass at WebSocketEventDriver with tests
2012-06-28 11:59:15 -07:00
324431a072
Adding support for discovering annotations from superclass chain
2012-06-28 10:53:57 -07:00
106db485ca
Adding tests for bad method modifiers and return types
2012-06-28 10:22:27 -07:00
891ab0b858
Test Not A Socket
2012-06-28 10:01:46 -07:00
7e93c2a409
More duplicate @OnWebSocketBinary testing
2012-06-28 09:57:22 -07:00
53425e061a
Allowing multiple @OnWebSocketFrame annotations, but preventing duplicate declarations on the same frameType
2012-06-28 09:36:14 -07:00
08796a7b37
Working EventMethod/EventMethods/EventMethodsCache with tests
2012-06-27 17:04:37 -07:00
270a04ebd0
rename tests for surefire to pick them up
2012-06-27 15:53:56 -05:00
Greg Wilkins
Joakim Erdfelt
Jesse McConnell