Commit Graph

785 Commits

Author SHA1 Message Date
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
Simone Bordet a88e2c5ebb Updated toString() implementations. 2011-12-16 20:53:15 +01:00
Joakim Erdfelt 5774c03e09 Refactoring protected fields back to private with protected methods per discussion with Simone 2011-12-15 11:07:27 -07:00
Joakim Erdfelt ae8c8551fc Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-14 14:07:37 -07:00
Greg Wilkins 300157fb2d more time needed for ssl test on slow machine 2011-12-14 12:01:23 -08:00
Greg Wilkins 5c5f783e2b Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-14 11:42:34 -08:00
Greg Wilkins bc48eb1f5b 366730 pass the time idle to onIdleExpire 2011-12-14 11:41:32 -08:00
Joakim Erdfelt c8e43ede1c Merge branch 'master' into websocket-servlet-refactor 2011-12-14 11:15:20 -07:00
Joakim Erdfelt 6b42a1c45d JETTY-1463 - WebSockets with Safari gets messages stuck as if in a buffer that needs to be flushed.
+ Implementation of Safari WebSocket Draft-0 behavior in a unit test.
  (Test fails, and is currently set as @Ignore)
2011-12-14 10:23:40 -07:00
Joakim Erdfelt 42816041c0 JETTY-1463 - WebSockets with Safari gets messages stuck as if in a buffer that needs to be flushed.
+ Adding unit test to attempt to replicate behavior (test passes)
2011-12-13 11:26:30 -07:00
Simone Bordet bcbcbafb14 More tests for WebSocket over SSL. 2011-12-13 11:15:04 +01:00
Joakim Erdfelt 004fa1ce1c Bug 365973 - Websocket client on android causes many VFY errors and
warnings.

+ Splitting out WebSocketConnection#handshake() into new
  WebSocketServletConnection interface and refactoring accordingly,
  in order to remove servlet-api dep on WebSocketConnection for
  appropriate websocket client use.
2011-12-12 09:02:40 -07:00
Joakim Erdfelt 6d2ad43cc4 365932 - Produce jetty-websocket aggregate jar for android use
+ revert last change using maven-shade-plugin as it didn't address
  the now redundant transitive dependencies present in the
  jetty-websocket pom.
+ made a formal jetty-aggregate/jetty-websocket build instead.
2011-12-07 12:13:57 -07:00
Joakim Erdfelt 6b54650046 365932 - Produce jetty-websocket aggregate jar for android use
+ Adding maven-shade-plugin default configuration (no bytecode
  manipulation) to produce an aggregate classifier jar for
  jetty-websocket use.
2011-12-07 10:17:20 -07:00
Simone Bordet 0689e05e9b 365750 - Support WebSocket over SSL, aka wss://
This is now implemented, using the new architecture of wrapping the connection with
SslConnection.
The only refactoring was to avoid that the HTTP handshake was sent from the
HandshakeConnection constructor, because at that point the SSL wiring is not ready yet.
Now the handshake is sent from handle(), guarded by a boolean variable to sent it once.
2011-12-06 16:25:15 +01:00
hmalphettes 89afbdf31d 360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6 2011-12-02 17:27:26 +08:00
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
2011-11-30 16:27:30 +11:00
Greg Wilkins 631b0ba1b6 [maven-release-plugin] prepare for next development iteration 2011-11-30 13:16:54 +11:00
Greg Wilkins 9d3745f999 [maven-release-plugin] prepare release jetty-8.1.0.RC0 2011-11-30 13:16:41 +11:00
Greg Wilkins 55d5020980 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
Greg Wilkins b969de1788 organized imports 2011-11-28 15:32:14 +11:00
Greg Wilkins 3b2d3e5754 websocket not supported on blocking connectors 2011-11-28 15:31:07 +11:00
Greg Wilkins ddce35a2e6 364638 SCEP does idle timestamp checking. New setCheckForIdle method controls onIdleExpired callback.
364921 a second onIdleExpired callback will result in close rather than a shutdown output.
2011-11-28 11:51:01 +11:00
Simone Bordet 8e913fe7c0 Fixed bug in AsyncEndPoint.hasProgressed() handling: the progressing status
must be remembered until a call to hasProgressed() is made.
Additional code cleanups.
2011-11-24 20:58:59 +01:00
Simone Bordet c6103f2d53 Removed usages of ThreadDeath. 2011-11-24 20:39:04 +01:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Joakim Erdfelt 7fb371a7ad Fixing testcase failure on blocking read/write during WebSocketClient use 2011-11-15 14:47:42 -07:00
Greg Wilkins a62061944e removed EndPoint.isBufferingInput 2011-11-11 11:41:29 +11:00
Greg Wilkins 921b285235 Avoid flush if no content to flush 2011-11-10 14:45:28 +11:00
Greg Wilkins 7a9b8f1e9d reverted last changes due to instability 2011-11-10 12:11:58 +11:00
Greg Wilkins d61258ec4e clean ups from review from sbordet.
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
Jesse McConnell 2a6b8696d7 Merge branch 'master' into jetty-8 2011-11-08 15:59:55 -06:00
Greg Wilkins 29fa330a6e 363124 improved websocket close handling 2011-11-09 07:09:13 +11:00
Greg Wilkins 21e692aee6 363124 improved websocket close handling 2011-11-08 18:18:34 +11:00
Greg Wilkins 7a082280f1 Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
	jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http/src/main/java/org/eclipse/jetty/http/ssl/SslContextFactory.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-11-07 18:09:31 +11:00
Joakim Erdfelt 2cff05c531 Bug 362853 - Promoting all Websocket STRICT blocks to standard behavior
+ Removing BRUTAL flag, and promoting its logic to standard behavior.
2011-11-04 11:27:50 -07:00
Joakim Erdfelt 373a2946be Bug 362853 - Promoting all Websocket STRICT blocks to standard behavior 2011-11-04 09:40:32 -07:00
Joakim Erdfelt 5ca9dbb7d4 Undoing recent change as redundant, existing STRICT block does the same thing 2011-11-03 16:03:46 -07:00
Joakim Erdfelt de4253b5e6 Bug 362850 - Websocket allowing >125 octets on control frame payloads 2011-11-03 15:47:12 -07:00
Joakim Erdfelt e2f15522bd Fixing junit test cases affected by close status code changes 2011-11-03 09:18:31 -07:00
Joakim Erdfelt c1d681551b Bug 362740 - Websocket D13 close handling is off [autobahn]
+ Address autobahn 0.4.3 test cases 7.9.*
  Description: Send close with invalid close code (999. 1004, 1005, 1006, 1011, 1100, 2000, 2999, 5000, 65535)
  Expectation: Clean close with protocol error code
2011-11-02 20:04:03 -07:00
Joakim Erdfelt da60996ce5 Bug 362740 - Websocket D13 close handling is off [autobahn]
+ Address autobahn 0.4.3 test case 7.5.1
  Description: Send a close frame with invalid UTF8 payload
  Expectation: Clean close with protocol error or invalid utf8 code
2011-11-02 17:22:40 -07:00
Joakim Erdfelt 4314c55c77 Bug 362740 - Websocket D13 close handling is off [autobahn]
+ Address autobahn 0.4.3 test case 7.3.2
  Description: Send a close frame with payload length 1
  Expectation: Clean close with protocol error
2011-11-02 16:58:29 -07:00
Joakim Erdfelt cafbb47a2f Bug 362740 - Websocket D13 close handling is off [autobahn]
+ Address autobahn 0.4.3 test case 7.3.1
  Description: Send a close frame with payload length 0 (no close code, no close reason)
  Expectation: Clean close with normal code
2011-11-02 16:47:48 -07:00
Jesse McConnell 2b6fec713c Merge branch 'master' into jetty-8 2011-11-02 16:47:04 -05:00
Joakim Erdfelt 903c5dcbbf Bug 362223 - Websocket client fails to send query parameters 2011-10-27 10:37:54 -07:00
Greg Wilkins 738cbfdccc refactored client to use upgradeable endpoint. Instert SslConnection when needed 2011-10-27 16:37:07 +11:00
Greg Wilkins 61664d3c0f Added concept of SslConnection 2011-10-26 01:15:59 +11:00
Jesse McConnell d5320d95ba [maven-release-plugin] prepare for next development iteration 2011-10-24 15:02:30 -05:00
Jesse McConnell d02f74a50c [maven-release-plugin] prepare release jetty-8.0.4.v20111024 2011-10-24 15:02:23 -05:00
Jesse McConnell 1d86da8f68 [maven-release-plugin] prepare for next development iteration 2011-10-24 14:52:54 -05:00
Jesse McConnell 5f349ecc92 [maven-release-plugin] prepare release jetty-7.5.4.v20111024 2011-10-24 14:52:48 -05:00
Greg Wilkins 5140a95144 refactored HttpConnection name 2011-10-20 15:12:19 +11:00
Greg Wilkins 0e284f78f5 Protected HttpParser from multiple entry. 2011-10-20 12:18:10 +11:00
Greg Wilkins 49f8b0de1a Websocket partially refactored and passing tests 2011-10-18 21:59:49 +11:00
Greg Wilkins 6edb7c1930 organised imports 2011-10-18 15:05:22 +11:00
Greg Wilkins e43b718fb1 Refactored NIO to better handle half closes. Applied the following policy:
Call shutdownOutput to signal the other end that you have written all the data that your are going to write (eg and the end of a non persistent HTTP response).   This can be done either by generator (when it is complete) or coordinator or handle - but we need to decide which and have only 1 doing it.
    Call shutdownInput to signal your own end that you have read -1 and to allow other local code to check that with an isInputShutdown. Ideally we could get by without any calls at all to shutdownInput, so long as we well handle reading -1 (Currently we don't).  This should be done by whatever does the IO read.
    Calling close should always be a real TCP close, even with SSL. SSL shutdown
    The default handling of an idle callback should be close.  But some connections (NOT endpoints) may implement idle as initiating a shutdown exchange (eg websocket close).   If they do, this is state that should be held in the connection or parser - ie do-this-exhange-and-then-shutdown
    Call close when you want to shutdown Output and you have already read -1, so input is already shutdown.   We need to double verify that this is correct and that if a FIN has been received from the other end, that a close will not result in a reset.  I'll do that today.
    Call close when you want to shutdown Input and output has already been shutdown.  This means you have read -1 after having sent a FIN.
    Call close on any errors.

The current state is that server HttpConnection appears to be working well.  Other connection types have not been updated and/or tested
2011-10-18 14:38:02 +11:00
Jesse McConnell a38f2a9e68 [maven-release-plugin] prepare for next development iteration 2011-10-11 10:16:54 -05:00
Jesse McConnell 55a1be5435 [maven-release-plugin] prepare release jetty-8.0.3.v20111011 2011-10-11 10:16:47 -05:00
Jesse McConnell 7d10182034 [maven-release-plugin] prepare for next development iteration 2011-10-11 08:47:07 -05:00
Jesse McConnell b6ac542604 [maven-release-plugin] prepare release jetty-7.5.3.v20111011 2011-10-11 08:47:00 -05:00
Jesse McConnell b55ec9bac1 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:59:52 -05:00
Jesse McConnell e32e8b1377 [maven-release-plugin] prepare release jetty-8.0.2.v20111006 2011-10-06 17:59:46 -05:00
Jesse McConnell 0c55c774d4 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:25:38 -05:00
Jesse McConnell 4d822759de [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 17:25:32 -05:00
Jesse McConnell b58006b4a4 [maven-release-plugin] prepare for next development iteration 2011-10-06 09:43:37 -05:00
Jesse McConnell 7eca345e8d [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 09:43:31 -05:00
Jan Bartel 32dbb1bddb Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-deploy/src/main/config/etc/jetty-deploy.xml
	jetty-distribution/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
	jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-10-04 17:45:15 +11:00
Greg Wilkins c438d7c043 improved websocket testserver example to include ping/pong 2011-10-03 18:03:57 +11:00
Greg Wilkins fbb4893352 improved websocket testserver example to include ping/pong 2011-10-03 18:03:42 +11:00
Greg Wilkins 7bf5f7792b 359673 updated websocket version handling 2011-10-03 16:04:37 +11:00
Greg Wilkins 18aa8fed9b 359673 updated websocket version handling 2011-10-03 16:04:13 +11:00
Greg Wilkins a6988108c3 minor cleanups and extra debug 2011-09-16 15:29:28 +10:00
Greg Wilkins 54961fca1f refined test options and output 2011-09-14 14:17:09 +10:00
Greg Wilkins 55d229e73c 357338 remove debug 2011-09-13 00:38:08 +10:00
Greg Wilkins c5e6378b84 357338 Improve UTF-8 validation 2011-09-12 13:14:09 +10:00
Greg Wilkins 4c885ca3ad 357178 websockets draft 14 support 2011-09-09 12:10:01 +10:00
Jesse McConnell d5304b2cbc [maven-release-plugin] prepare for next development iteration 2011-09-08 12:20:15 -05:00
Jesse McConnell c33548d38a [maven-release-plugin] prepare release jetty-8.0.1.v20110908 2011-09-08 12:19:24 -05:00
Jesse McConnell ebdb89dc23 [maven-release-plugin] prepare for next development iteration 2011-09-08 12:00:16 -05:00
Jesse McConnell 932245a114 [maven-release-plugin] prepare release jetty-7.5.1.v20110908 2011-09-08 12:00:10 -05:00
Jesse McConnell 721c8ab682 updating version.txt and resetting pom version to 8.0.1-SNAPSHOT 2011-09-08 11:54:53 -05:00
Jesse McConnell f8c1858efb Merge branch 'jetty-8' into release-8 2011-09-08 11:52:23 -05:00
Jesse McConnell 97dee04a68 merge over from jetty7 2011-09-08 11:51:48 -05:00
Jesse McConnell 37d0f53b0a updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT 2011-09-08 11:40:37 -05:00
Jesse McConnell 4a575d4958 Merge branch 'master' into release 2011-09-08 11:36:48 -05:00
Greg Wilkins e914e0f97f improved websocket handling of error cases for autobahn test suite 2011-09-09 01:52:27 +10:00
Greg Wilkins b8556bec76 fixes from running autobahn test suite 2011-09-08 11:35:39 +10:00
Jesse McConnell 4e47d6a7fa [maven-release-plugin] prepare for next development iteration 2011-09-07 18:16:58 -05:00
Jesse McConnell d77a12962b [maven-release-plugin] prepare release jetty-8.0.1.v20110907 2011-09-07 18:16:50 -05:00
Jesse McConnell 6b614a54f0 [maven-release-plugin] prepare for next development iteration 2011-09-07 18:12:16 -05:00
Jesse McConnell ce55c8c601 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 18:12:09 -05:00
Jesse McConnell 7c7fc30b90 Merge over from jetty 7 master 2011-09-07 16:08:35 -05:00
Jesse McConnell 1744b5bce1 reset from release 2011-09-07 11:09:46 -05:00
Jesse McConnell ae86ad6d4e [maven-release-plugin] prepare for next development iteration 2011-09-07 10:03:16 -05:00
Jesse McConnell 86383afbd2 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 10:03:10 -05:00
Greg Wilkins 65a1e84886 misc findbugs cleanups 2011-09-07 15:57:18 +10:00
Greg Wilkins cf45e7b647 356823 correctly decode close codes. Send not utf-8 close code. 2011-09-07 11:37:46 +10:00
Greg Wilkins 1d6079e78f findbugs inspired code cleanups 2011-09-06 11:22:37 +10:00
Simone Bordet b1f95541de Fixes #356749 (WebSocket message length is computed wrongly when greater than 0xFFFF), and a bunch of other silly mistakes. 2011-09-06 00:18:02 +02:00
Simone Bordet a8ce6e8878 Fixed pom.xml by declaring dependencies in the right way.
Dependency on jetty-server must be kept with scope provided (the classes that depend on jetty-server can only be run on Jetty).
2011-09-05 11:18:47 +02:00
Greg Wilkins 8a40a0d9fb 356695 jetty server jars are provided for websockets 2011-09-05 11:21:26 +10:00
Jesse McConnell 40dcb10ed8 [maven-release-plugin] prepare for next development iteration 2011-09-01 12:24:32 -05:00
Jesse McConnell db14b194fa [maven-release-plugin] prepare release jetty-8.0.0.v20110901 2011-09-01 12:24:24 -05:00
Jesse McConnell 402352962d Merge branch 'master' into jetty-8 2011-09-01 11:24:21 -05:00
Jesse McConnell a728021edf [maven-release-plugin] prepare for next development iteration 2011-09-01 11:17:05 -05:00
Jesse McConnell 882308f781 [maven-release-plugin] prepare release jetty-7.5.0.c20110901 2011-09-01 11:16:58 -05:00
Jesse McConnell c3e170bb74 Merge branch 'master' into release 2011-09-01 10:56:08 -05:00
Greg Wilkins 6a15cf7dc7 javadoc 2011-09-01 23:49:30 +10:00
Greg Wilkins e68d056b0f setters for max message size in client factory 2011-09-01 23:33:05 +10:00
Greg Wilkins ddd77f8c08 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:19:52 +10:00
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Greg Wilkins 0b489b8877 356421 Upgraded websocket to draft 13 support 2011-09-01 12:11:10 +10:00
Greg Wilkins 9528870b23 improved setting of default message maximums 2011-09-01 10:48:43 +10:00
Jesse McConnell 57e9045635 [maven-release-plugin] prepare for next development iteration 2011-08-31 14:17:32 -05:00
Jesse McConnell 317491a4d7 [maven-release-plugin] prepare release jetty-7.5.0.v20110901 2011-08-31 14:17:25 -05:00
Simone Bordet 0f8939dd96 Added test for the lost messages bug. 2011-08-31 18:29:09 +02:00
Greg Wilkins ba87334389 353073 better warnings 2011-08-31 21:53:34 +10:00
Greg Wilkins 0a5e3d2f4c 353073 better warnings 2011-08-31 21:46:42 +10:00
Greg Wilkins 0f54330156 353073 more false frag tests 2011-08-31 21:41:13 +10:00
Greg Wilkins 82e364730b 353073 blocking tests 2011-08-31 18:35:40 +10:00
Greg Wilkins a55ba2eac3 353073 blocking tests 2011-08-31 17:07:48 +10:00
Greg Wilkins 3c02be9cab more info in expires message 2011-08-31 00:14:54 +10:00
Greg Wilkins 0d17559f7d handle -1 maxIdleTime as disabled timeout 2011-08-30 23:37:41 +10:00
Greg Wilkins 139dd9fa66 start websocket client factory thread pool 2011-08-30 19:23:17 +10:00
Greg Wilkins 33fa7afb47 356144 added SelectorManager.setSelectorPriorityDelta(int) 2011-08-30 14:24:28 +10:00
Simone Bordet 3cbe6f7ca0 Javadocs. 2011-08-30 00:36:52 +02:00
Simone Bordet 2f76dd13a4 Added getter and setter to configure the bind address.
Removed uneffective setSoTimeout() call, it is not used for non-blocking sockets.
Reworked javadocs.
2011-08-30 00:21:14 +02:00
Michael Gorovoy 1ba88a6a4b 352188 TestClient correctly processes --host option in jetty-websocket 2011-08-29 14:13:53 -04:00
Greg Wilkins 39d0d4fee9 353073 deprecated non factory method for websocket clients 2011-08-29 12:27:53 +10:00
Joakim Erdfelt 79db394552 Merge from trunk 2011-08-26 10:12:45 -07:00
Greg Wilkins c99498af91 353073 factory pattern for clients 2011-08-26 11:50:33 +10:00
Joakim Erdfelt 4ace183764 Merging from master 2011-08-25 12:09:36 -07:00
Simone Bordet f9eafd34eb Using NullMaskGen if masking is disabled. 2011-08-25 14:02:16 +02:00
Simone Bordet 97cc150144 Renamed methods to enable/disable masking to is/setMaskingEnabled(). 2011-08-25 12:26:33 +02:00
Greg Wilkins a7a45bf7d9 353073 allows null masks for websocket client 2011-08-25 18:36:34 +10:00
Greg Wilkins 68d562008e 353073 draft 12 update 2011-08-25 14:05:12 +10:00
Greg Wilkins def117775d 353073 recycle buffer 2011-08-25 12:28:49 +10:00
Joakim Erdfelt f7f7e0af75 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of jetty-security, jetty-server, jetty-servlet,
  jetty-servlets, jetty-websocket
2011-08-24 12:53:27 -07:00
Greg Wilkins 44b8d56289 353073 updated to draft 11 2011-08-24 10:28:39 +10:00
Greg Wilkins 6867dae4ee 353073 Add websocket origin setter 2011-08-22 12:02:00 +10:00
Michael Gorovoy ee1f0e5d9e Quick javadoc fixes 2011-08-19 12:16:04 -04:00
Greg Wilkins e5a3cb9cef [maven-release-plugin] prepare for next development iteration 2011-08-19 22:17:46 +10:00
Greg Wilkins f0b4ffffda [maven-release-plugin] prepare release jetty-7.5.0.RC1 2011-08-19 22:17:33 +10:00
Jesse McConnell 4700979200 [maven-release-plugin] prepare for next development iteration 2011-08-16 09:26:56 -05:00
Jesse McConnell 3ae78dfbb2 [maven-release-plugin] prepare release jetty-8.0.0.RC0 2011-08-16 09:26:48 -05:00
Greg Wilkins ee1afa5e97 353073 cleaned up no context logging 2011-08-16 17:59:28 +10:00
Jan Bartel 6e8afd6795 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
2011-08-16 11:35:46 +10:00
Jesse McConnell 4d7ba354e1 [maven-release-plugin] prepare for next development iteration 2011-08-15 14:18:53 -05:00
Jesse McConnell 2175bae0a0 [maven-release-plugin] prepare release jetty-7.5.0.RC0 2011-08-15 14:18:42 -05:00
Greg Wilkins bfda9e0523 353073 removed old origin handling 2011-08-15 16:16:34 +10:00
Greg Wilkins 2cb0cd377e 353073 better close messages 2011-08-15 15:19:14 +10:00
Jan Bartel 050cb83b35 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
	jetty-websocket/pom.xml
2011-08-12 18:43:15 +10:00
Greg Wilkins 11d89c9e3f 353073 too large message handling 2011-08-12 14:23:51 +10:00
Greg Wilkins 365bc6bb67 353073 use java.net ProtocolException 2011-08-11 18:24:13 +10:00
Greg Wilkins 8ae43e9bea 353073 expose cookie api 2011-08-11 17:26:15 +10:00
Greg Wilkins c07e14840c 353073 Support fake fragements, so that frames may be larger than buffers 2011-08-11 13:26:12 +10:00
Greg Wilkins d63294bfe4 353073 Improved client javadoc 2011-08-11 12:18:36 +10:00
Greg Wilkins 72caa15632 353073 Improved client API to use futures 2011-08-11 11:52:33 +10:00
Greg Wilkins 6b9ecd0806 353073 Improved client API to use futures 2011-08-11 11:50:23 +10:00
Greg Wilkins 5ea2806c08 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
Conflicts:
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
2011-08-09 15:45:17 +10:00
Greg Wilkins 75dacc2b61 fixed websocket client tests 2011-08-09 15:39:26 +10:00
Jesse McConnell 3dd582475b Resolve test case issue with comment for Greg on proper order of on*
responses for websocket interface
2011-08-05 12:44:41 -05:00
Joakim Erdfelt f930050a4a Working out what testBadHandshake keeps failing 2011-08-05 10:11:38 -07:00
Joakim Erdfelt 300f449e6f Working out what testBadHandshake keeps failing 2011-08-05 09:55:51 -07:00
Joakim Erdfelt 1b51da30f4 Working out what testBadHandshake keeps failing 2011-08-05 09:30:23 -07:00
Jan Bartel 02a66a00fb Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
	pom.xml
2011-08-01 14:39:39 +10:00
Greg Wilkins 2806869cfd 353073 test harness for websocket client and improved ietf draft 10 compliance 2011-08-01 12:35:01 +10:00
Greg Wilkins 5c11d3af38 353073 named logger 2011-07-28 17:13:26 +10:00
Greg Wilkins f17d271f07 353073 parallel test option 2011-07-27 11:15:38 +10:00
Greg Wilkins 5859a85919 353073 WebSocketClient 2011-07-26 17:31:55 +10:00
Greg Wilkins 70d7d3c9a5 reverted version 2011-07-18 09:15:31 +10:00
Greg Wilkins a26ddd5933 created performance version 2011-07-14 15:38:25 +10:00
Jan Bartel 86f7e76c4d Merge of jetty-7 into jetty-8
Conflicts:
	VERSION.txt
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/pom.xml
	jetty-nested/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-07-11 12:05:58 +10:00
Jesse McConnell 39674f8a8e [maven-release-plugin] prepare for next development iteration 2011-07-07 18:43:56 -05:00
Jesse McConnell 5aa94f502e [maven-release-plugin] prepare release jetty-7.4.4.v20110707 2011-07-07 18:43:50 -05:00
Greg Wilkins 17e907c2fb git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +10:00
Jesse McConnell 6190961f31 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3454 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 11:12:45 +00:00
Jesse McConnell db9f79eaff [maven-release-plugin] prepare release jetty-7.4.3.v20110701
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3452 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 11:12:33 +00:00
Greg Wilkins baabacfe95 reverted to 7.4.4-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3448 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 02:22:56 +00:00
Jesse McConnell b9fffcb9a0 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3447 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:54:20 +00:00
Jesse McConnell ea23a83bb3 [maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3445 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:54:07 +00:00
Jesse McConnell b1ca45e709 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3441 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-30 19:49:20 +00:00
Jesse McConnell 5f5cb8ea53 [maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3439 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-30 19:39:23 +00:00
Greg Wilkins 451580e4ee 349897 draft -09 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3409 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-21 05:33:52 +00:00
Jesse McConnell 54e885d967 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3289 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 12:20:58 +00:00
Jesse McConnell e35f16bae5 [maven-release-plugin] prepare release jetty-7.4.2.v20110526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3287 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 12:14:37 +00:00
Jesse McConnell 64cbf74b09 reset poms for release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3286 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 11:59:36 +00:00
Greg Wilkins 92c1a7bc5d [maven-release-plugin] prepare release jetty-7.4.2.v20110526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3277 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 08:51:01 +00:00
Joakim Erdfelt 26d59fda32 Javadoc error cleanup.
+ Removing missing class references
+ Fixing empty @return statements
+ Delinking invalid direction class references
+ Correcting @param <name> typos

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3219 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-19 22:26:41 +00:00
Jesse McConnell 51f6df9871 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3184 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:57:00 +00:00
Jesse McConnell 28e63af76b [maven-release-plugin] prepare release jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3182 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:56:45 +00:00
Jesse McConnell 0793141d2c [maven-release-plugin] rollback the release of jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3181 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:39:59 +00:00
Jesse McConnell be9da35ef4 set for test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3180 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:39:17 +00:00
Jesse McConnell 898470696c updating to parent-17-snapshot and various changes to work with updated maven plugins
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3164 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 13:41:15 +00:00
Greg Wilkins f8dc394adb [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3137 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 04:48:47 +00:00
Greg Wilkins 6e0649ab3f [maven-release-plugin] prepare release jetty-7.4.1.v20110513
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3135 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 04:48:21 +00:00
Jesse McConnell 314a59192d [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3131 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:57:07 +00:00
Jesse McConnell fadbd0bdc5 [maven-release-plugin] prepare release jetty-7.4.1.v20110512
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3129 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:56:53 +00:00
Greg Wilkins 5d0f1b88f4 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3128 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:46 +00:00
Greg Wilkins 83b6c19cca [maven-release-plugin] prepare release jetty-7.4.1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3126 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:19 +00:00
Greg Wilkins 9f5376269a public
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3075 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-05 00:04:25 +00:00
Greg Wilkins a9a192bab5 344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3060 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 02:12:23 +00:00
Greg Wilkins 554309e5ac 344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3059 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 02:09:54 +00:00
Greg Wilkins 4e2d8d9c18 344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3055 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-02 14:58:00 +00:00
Greg Wilkins 9f6e934c4f 344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3054 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-02 09:30:21 +00:00
Greg Wilkins 88bfdd6631 344059 added extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3053 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-02 09:20:36 +00:00
Greg Wilkins a70bbc004d 344059 extension framework for websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3052 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-02 01:42:05 +00:00
Greg Wilkins 3e35b74651 344059 Websockets draft-07
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3035 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-27 23:27:56 +00:00
Greg Wilkins 936b80dd46 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3018 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:30 +00:00
Greg Wilkins a01a1edd70 [maven-release-plugin] prepare release jetty-7.4.0.v20110414
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3016 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:04 +00:00
Greg Wilkins 975ee04df4 minor cleanup of variable names and ordering
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3015 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 01:45:36 +00:00
Greg Wilkins 58652d8f09 342700 refine websocket API for anticipated changes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3013 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-13 11:05:35 +00:00
Greg Wilkins d3c5eddd79 342504 Scanner Listener
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2999 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-12 02:12:52 +00:00
Greg Wilkins e5bad59c14 minor clean ups and removed debug
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2997 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-11 08:18:01 +00:00
Greg Wilkins b43b2607ad [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2992 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:34 +00:00
Greg Wilkins b6d04cc349 [maven-release-plugin] prepare release jetty-7.4.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2990 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:08 +00:00
Greg Wilkins 50541649ca Get ready for 7.4 release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2952 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-01 03:42:09 +00:00
Simone Bordet 7dfec125f2 Made interface Acceptor public, otherwise other packages such as CometD cannot implement it, and cleaned up the code.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2920 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-29 11:13:55 +00:00
Greg Wilkins a6483bfa6f 340265 Improve handling of io shutdown in SSL
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2906 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-23 03:36:06 +00:00
Greg Wilkins c26cc92857 337685 improved progress return
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2888 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-14 13:26:41 +00:00
Greg Wilkins 80a56c31a2 websocket debugging
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2887 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-14 12:06:28 +00:00
Greg Wilkins 7cca101aeb improved ws tests
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2886 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-14 03:54:41 +00:00
Greg Wilkins 3a267d9dd8 JETTY-1245 Pooled Buffers implementation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2885 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-14 03:09:56 +00:00
Greg Wilkins 8aba6c12a6 readme
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2884 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-14 02:53:16 +00:00
Greg Wilkins 31d8e8b3dc 337685 more common code
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2880 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-11 05:00:45 +00:00
Greg Wilkins 3078c8797e 337685 testing with FF
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2879 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-11 04:10:12 +00:00
Greg Wilkins 6cbd1225a6 337685 Update websocket API in preparation for draft -07
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2878 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-10 13:32:31 +00:00
Greg Wilkins e20fa91252 337685 Update websocket API in preparation for draft -07
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2877 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-10 13:15:27 +00:00
Greg Wilkins c2bc7a5ddd [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2864 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 05:42:13 +00:00
Greg Wilkins 1d5a6de9c7 [maven-release-plugin] prepare release jetty-7.3.1.v20110307
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2862 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 05:41:43 +00:00
Greg Wilkins 1a6cdeb12f 338880 Fixed failing buffer range checks
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2858 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 02:51:05 +00:00
Greg Wilkins db438ca86f [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2854 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-04 03:58:46 +00:00
Greg Wilkins 70bd1c2085 [maven-release-plugin] prepare release jetty-7.3.1.v20110304
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2852 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-04 03:58:19 +00:00
Greg Wilkins 13a46c3e9c 337685 java 1.5
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2843 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-01 22:33:16 +00:00