495 Commits

Author SHA1 Message Date
Joakim Erdfelt
bfadca49b5 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-11-16 13:56:31 -07:00
Joakim Erdfelt
e6b3216708 Issue #1090 - Delaying role of WebSocketUpgradeFilter till .init()
+ WebSocketServerContainerInitializer now initializes the
  MappedWebSocketCreator, WebSocketServerFactory, and
  ServerContainer directly, but puts the components needed
  by WebSocketUpgradeFilter into ServletContext attributes
  that it can obtain in its own init()
+ Added optional org.eclipse.jetty.websocket.jsr356.addDynamicFilter
  init-param/attribute key to disable/enable the automatic addition
  of the WebSocketUpgradeFilter during JSR356 init (to allow
  WEB-INF/web.xml specified filter to operate instead)
+ Added WebSocketServerContainerINitializer.isEnabledViaContext()
  to make testing the init-param and attributes more generic
2016-11-16 13:43:06 -07:00
Joakim Erdfelt
2295bd59e3 Issue #1090 - Use WebSocketUpgradeFilter from WEB-INF/web.xml if present 2016-11-10 14:26:04 -07:00
Joakim Erdfelt
2c38511828 Updating to version 9.3.15-SNAPSHOT 2016-10-28 13:01:34 -07:00
Joakim Erdfelt
14611d2f76 Updating to version 9.3.14.v20161028 2016-10-28 12:21:02 -07:00
Joakim Erdfelt
2c7964d9c9 Issue #207 - fixing EchoTest 2016-10-21 13:53:31 -07:00
Joakim Erdfelt
ade14ba34b Updating to version 9.3.14-SNAPSHOT 2016-10-14 11:33:51 -07:00
Joakim Erdfelt
c3a78e70a8 Updating to version 9.3.13.v20161014 2016-10-14 10:39:37 -07:00
Joakim Erdfelt
4202a98ec5 Issue #207 - @PathParam support fixes
+ Arg.tag is now exposed for general use
+ JsrEndpointFunctions now decode (into primitives) the URI template
  exposed @PathParam static arguments
+ JsrEndpointFunctions simplified tracking of static args
+ ServerContainer.assertValidEndpoint() now validates
  added endpoints with @PathParam immediately (per spec)
  using a UriTemplate where each variable is an empty string
2016-10-13 15:58:34 -07:00
Joakim Erdfelt
f920c65bcc Issue #207 - ensuring WebSocketServerFactory init occurs earlier 2016-10-13 14:41:53 -07:00
Joakim Erdfelt
681bddc728 Removing eclipse detrius 2016-10-13 14:40:29 -07:00
Joakim Erdfelt
3ee2e4ab7b Issue #207 - javax.websocket.DeploymentException thrown at addEndpoint now 2016-10-12 12:07:08 -07:00
Jesse McConnell
863913b64e set for dev 2016-09-30 19:05:47 +00:00
Jesse McConnell
b91cc8a4ea set for release 2016-09-30 18:01:20 +00:00
Joakim Erdfelt
6cf10172ca Updating to version 9.3.13-SNAPSHOT 2016-09-15 07:34:52 -07:00
Joakim Erdfelt
8b35fdc5a5 Updating to version 9.3.12.v20160915 2016-09-15 06:48:16 -07:00
Joakim Erdfelt
fb7da26ad2 Updating to version 9.2.20-SNAPSHOT 2016-09-08 13:04:11 -07:00
Joakim Erdfelt
7b94bc32f4 Updating to version 9.2.19.v20160908 2016-09-08 12:11:44 -07:00
Joakim Erdfelt
36f657165f Issue #207 - Support javax.websocket version 1.1
+ More testcase improvements
2016-08-25 11:03:42 -07:00
Joakim Erdfelt
1cf61d6df7 Issue #207 - Support javax.websocket version 1.1
+ Removing more EventDriver references
+ Fixing bad implementation exposed by testcases
2016-08-19 17:59:07 -07:00
Joakim Erdfelt
1d341398da Fixing up javadoc 2016-08-19 15:45:43 -07:00
Joakim Erdfelt
f1a8bafabe Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt
b71be7c808 Trailing merge fixes 2016-08-19 15:03:32 -07:00
Joakim Erdfelt
57bbf67735 Issue #207 - Support javax.websocket version 1.1
WIP
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
39f1d7332c 467246 - Support javax.websocket version 1.1
+ WIP
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
6e1b1cdb36 Updating to version 9.3.12-SNAPSHOT 2016-07-21 19:07:19 -07:00
Joakim Erdfelt
9fd6d4354e Updating to version 9.3.11.v20160721 2016-07-21 18:37:09 -07:00
Joakim Erdfelt
0b18340179 Updating to version 9.2.19-SNAPSHOT 2016-07-21 13:10:23 -07:00
Joakim Erdfelt
d3ff3423f0 Updating to version 9.2.18.v20160721 2016-07-21 12:35:26 -07:00
Jesse McConnell
ae931538ab [maven-release-plugin] prepare for next development iteration 2016-06-22 13:59:10 -05:00
Jesse McConnell
df1ed4fb03 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 13:59:06 -05:00
Jesse McConnell
030ec61837 [maven-release-plugin] prepare for next development iteration 2016-06-22 09:14:25 -05:00
Jesse McConnell
9a4cb41122 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 09:14:21 -05:00
Jesse McConnell
f2264c96a6 Merge branch 'jetty-9.3.x' into release-9.3.10 2016-06-22 08:40:46 -05:00
Jesse McConnell
e7034117ea [maven-release-plugin] prepare for next development iteration 2016-06-21 08:50:13 -05:00
Jesse McConnell
16c435c69d [maven-release-plugin] prepare release jetty-9.3.10.v20160621 2016-06-21 08:50:09 -05:00
Joakim Erdfelt
45a0c0f38d Merge branch 'jetty-9.4.x' 2016-06-20 17:56:30 -07:00
Joakim Erdfelt
1418892d4f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-20 17:56:17 -07:00
Joakim Erdfelt
78c9010400 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-06-20 17:55:49 -07:00
Joakim Erdfelt
bcc57d161a Fixes #425 - Removing duplicate Decoder affecting lifecycle
+ Duplicate Decoder was created and used in OnMessageCallable.
  Now using DecoderFactory to obtain already instantiated
  Decoder instead.
2016-06-20 17:47:29 -07:00
Greg Wilkins
8dd61c6d1c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-15 18:07:01 +10:00
Greg Wilkins
e607acfa4e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-15 18:06:32 +10:00
Greg Wilkins
0e5de87d49 Issue #663 Cleanup
Increased websocket tests timeouts
2016-06-15 18:04:33 +10:00
Simone Bordet
e6210e1a43 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-13 23:39:47 +02:00
Simone Bordet
3dca610f7b Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-13 23:39:23 +02:00
Simone Bordet
ebee9f12f9 Fixed SessionTrackingTest.
Introduced WebSocketSession.Listener that can be used to be notified
of session opening and close, so that tests can be written more reliably.
2016-06-13 23:23:15 +02:00
Simone Bordet
77de314ce1 Fixes #639 - ServerContainer stores WebSocket sessions twice.
ServerContainer now delegates session storage to WebSocketServerFactory.
2016-06-13 23:23:14 +02:00
Simone Bordet
e578c79b41 Code cleanups. 2016-06-13 23:23:14 +02:00
Jesse McConnell
e79c4d582b Merge branch 'jetty-9.4.x' 2016-06-07 11:57:39 -05:00
Jesse McConnell
20c1301203 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 11:56:27 -05:00