1399 Commits

Author SHA1 Message Date
Joakim Erdfelt
63c7556c2a 407469 - Method parameters for @OnWebSocketError should support Throwable
+ Simple javadoc fix, code already uses Throwable.
2013-05-08 11:27:51 -07:00
Joakim Erdfelt
f92aab9b88 407470 - Javadoc for @OnWebSocketFrame incorrectly references WebSocketFrame object
+ Simple javadoc change, code already uses Frame, not WebSocketFrame.
2013-05-08 11:27:51 -07:00
Joakim Erdfelt
08161b5bf7 Cleaning up examples for doc 2013-05-08 11:27:51 -07:00
Jesse McConnell
3d600ed95e [maven-release-plugin] prepare for next development iteration 2013-05-06 18:13:04 -05:00
Jesse McConnell
d832f3dc7e [maven-release-plugin] prepare release jetty-9.0.3.v20130506 2013-05-06 18:12:55 -05:00
Joakim Erdfelt
f2528642d9 Making Jetty WebSocket API Echo Examples more consistent (for doc) 2013-05-06 13:47:28 -07:00
Jan Bartel
e7ecfd2b2b Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
Joakim Erdfelt
9ad5ab1ed5 406449 - Session's disconnect not detected
+ Vastly cleaned up IOState and ConnectionState behavior
2013-04-30 15:54:41 -07:00
Joakim Erdfelt
ef77b854fa 404911 - WebSocketCloseTest fails spuriously
+ Renabling test
+ Using EventQueue from jetty-test-helper instead
+ Standarizing HttpResponseHeaderParser into websocket-common so that
  remaining bytebuffer logic is maintained in one place.
+ Making BlockingClient also use HttpResponseHeaderParser
2013-04-26 15:37:46 -07:00
Joakim Erdfelt
092a91008c JSR-356 fixing EndpointConfig use with extends Endpoint 2013-04-26 09:30:02 -07:00
Joakim Erdfelt
c91c3f2f60 JSR-356: adding WebSocketConfiguration and reworking ServerContainer init 2013-04-24 14:33:46 -07:00
Joakim Erdfelt
a4644dc780 JSR-356 working out server endpoint creation 2013-04-23 11:06:01 -07:00
Joakim Erdfelt
7c0f30fc2c Bumping up version to 9.0.3-SNAPSHOT 2013-04-22 11:03:25 -07:00
Joakim Erdfelt
9463eee427 Merge branch 'master' into javawebsocket-jsr 2013-04-19 09:25:03 -07:00
Greg Wilkins
a7073d05a6 updated version to 9.1.0-SNAPSHOT 2013-04-19 13:59:18 +10:00
Jan Bartel
d34bd7aec7 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-18 12:16:24 +10:00
Joakim Erdfelt
754dfa979e JSR-356: adding example of mixed pathspec 2013-04-17 14:25:47 -07:00
Joakim Erdfelt
df77322ff1 JSR-356: Reworking PathSpec 2013-04-17 13:54:14 -07:00
Joakim Erdfelt
43459d4b33 Adding benchmark for PathMappings 2013-04-17 11:17:27 -07:00
Jesse McConnell
7baaa14ba1 [maven-release-plugin] prepare for next development iteration 2013-04-17 11:46:39 -05:00
Jesse McConnell
e390b54b25 [maven-release-plugin] prepare release jetty-9.0.2.v20140417 2013-04-17 11:46:31 -05:00
Joakim Erdfelt
119a1bb1cf Guarding ExtensionStack.toString() from NPE 2013-04-17 10:54:19 -05:00
Joakim Erdfelt
b2e675ebad Merge branch 'master' into javawebsocket-jsr 2013-04-17 07:16:03 -07:00
Joakim Erdfelt
824675d072 Guarding ExtensionStack.toString() from NPE 2013-04-16 06:49:33 -07:00
Joakim Erdfelt
1f45b3678b Updating version 2013-04-15 12:39:15 -07:00
Joakim Erdfelt
2ae436f803 Fixing missing license 2013-04-15 12:39:03 -07:00
Joakim Erdfelt
8088edc96c Merge branch 'master' into javawebsocket-jsr 2013-04-15 12:12:25 -07:00
Joakim Erdfelt
fe25ef0454 JSR-356 working on server handlers 2013-04-15 12:11:57 -07:00
Jesse McConnell
0b20467c6f [maven-release-plugin] prepare for next development iteration 2013-04-15 11:40:45 -05:00
Jesse McConnell
3aa4301711 [maven-release-plugin] prepare release jetty-9.0.2.v20140415 2013-04-15 11:40:37 -05:00
Jan Bartel
db21b42b4f Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds). 2013-04-15 17:44:35 +10:00
Jan Bartel
07b844bf85 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-11 15:55:04 +10:00
Joakim Erdfelt
dc5480aafe JSR-356: adding more PathParamSpec tests and fixes 2013-04-10 16:51:47 -07:00
Joakim Erdfelt
36f0cf41ff JSR-356 initial pass at PathParam based PathSpec 2013-04-09 16:13:54 -07:00
Joakim Erdfelt
e0d353629f JSR-356 - updates to Session tracking and start of PathMappings
+ Refactored websocket-commons Session creation to be factory based
+ Introduced new org.eclipse.jetty.websocket.common.SessionFactory
+ Made websocket-client and websocket-server use new SessionFactory
+ Introduced JsrSessionFactory to allow for consistent Session creation
  even in the Jsr (no more duplciate Session creation)
+ Using JsrSessionFactory in javax-websocket-client-impl
+ Introducing PathMappings to hopefully replace jetty-util's PathMap
+ Using standard ClientEndpointConfig when appropriate.
+ Introducing JettyClientEndpointConfig for annotation based
  configurations
+ Renaming EchoSocket used in javax.websocket client testing to
  JettyEchoSocket to better indicate that its the Jetty server side
  implementation and not the javax.websocket client side socket.
+ Changed IncomingFrames.incomingError() parameter from
  WebSocketException to Throwable to match behavior on the JSR
2013-04-09 11:21:59 -07:00
Greg Wilkins
b8dd8bde14 [maven-release-plugin] prepare for next development iteration 2013-04-08 12:31:34 +10:00
Greg Wilkins
bf3771904b [maven-release-plugin] prepare release jetty-9.0.1.v20130408 2013-04-08 12:30:59 +10:00
Joakim Erdfelt
4dea484853 Merge branch 'master' into javawebsocket-jsr 2013-04-04 12:03:30 -07:00
Joakim Erdfelt
d1692733f5 JSR-356: MessageHandler(s) layer 2013-04-04 12:03:11 -07:00
Simone Bordet
024936c2de Temporarily ignoring this test that fails spuriously (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=404911). 2013-04-04 17:11:01 +02:00
Simone Bordet
72219d016b 404610 - Reintroduce ability to disallow TLS renegotiation. 2013-04-04 17:11:01 +02:00
Jan Bartel
7523c5234c Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-jsp/pom.xml
2013-04-04 13:31:33 +11:00
Joakim Erdfelt
3a66b3ec3f JSR-356 first working annotated @ClientEndpoint echo test 2013-03-28 10:51:45 -07:00
Joakim Erdfelt
fc7526b739 [JSR-356] Refactoring annotated callables to handle any-order rule 2013-03-26 17:30:49 -07:00
Joakim Erdfelt
3c59f15a5c Some basic @ServerEndpoint scanning tests 2013-03-25 09:56:04 -07:00
Joakim Erdfelt
725887620c Some basic @ServerEndpoint scanning tests 2013-03-25 09:56:01 -07:00
Joakim Erdfelt
a498107c42 Parameter identification refactor + Decoder and PathParam integration 2013-03-22 13:18:02 -07:00
Joakim Erdfelt
0bab7b2c6d reverting dispatched session open 2013-03-22 13:18:02 -07:00
Joakim Erdfelt
bf335f496d 403817 - Use of WebSocket Session.close() results in invalid status code
+ Fixing WebSocketSession.close() to delgate NORMAL close properly
2013-03-22 13:18:02 -07:00
Joakim Erdfelt
54fd961354 403380 - Introduce WebSocketTimeoutException to differentiate between EOF on write and Timeout 2013-03-22 13:18:02 -07:00