871 Commits

Author SHA1 Message Date
Simone Bordet
c5c0cc71d0 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-11-23 12:18:29 +01:00
Simone Bordet
a9817d7ac2 Fixes #1123 - Broken lifecycle for WebSocket's mappings.
Now resetting the mappings in the lifecycle callbacks of the
enclosing classes.
2016-11-23 12:14:01 +01:00
Joakim Erdfelt
d361786e43 Issue #1118 - Eliminating .destroy() conflict
+ extending from AbstractLifeCycle instead of ContainerLifeCycle
2016-11-22 09:48:01 -07:00
Joakim Erdfelt
1003969468 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-17 11:04:40 -07:00
Joakim Erdfelt
7930a3dac8 Fixing merge 9.2.x -> 9.3.x 2016-11-16 18:31:33 -07:00
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
Jesse McConnell
9a6f68be78 Merge branch 'release-9.3.14' into jetty-9.3.x 2016-11-07 10:45:04 -06:00
Joakim Erdfelt
996253c971 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-02 11:33:57 -07:00
Joakim Erdfelt
3a8cdc93d8 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-11-02 11:33:43 -07:00
Joakim Erdfelt
c665106fc5 Issue #1057 - Improve WebSocketUpgradeFilter performance
+ Tests for WebSocket upgrade now evaluates the request
  from least common feature to most common feature, so as
  minimize the testing of the request object on every request
2016-11-02 11:28:56 -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
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
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
2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -07:00
Jan Bartel
e45e649761 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-28 15:06:12 +10:00
Joakim Erdfelt
b3d25183b5 Fixes #780 - The moved websocket PathSpec is incompatible with cometd 3.0.x 2016-07-27 09:31:11 -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
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
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
876f20006d Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-14 11:04:54 +02:00
Simone Bordet
dc7bd636d0 Increased timeouts to avoid failures on slower machines. 2016-06-14 11:04:18 +02:00
Simone Bordet
fb76491ea0 Code cleanups. 2016-06-14 11:04:01 +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
e578c79b41 Code cleanups. 2016-06-13 23:23:14 +02:00
Jesse McConnell
20c1301203 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 11:56:27 -05:00
Joakim Erdfelt
dd8afc34b9 Merge branch 'jetty-9.3.x' into bugs/388 2016-06-06 08:37:36 -07:00
Joakim Erdfelt
8758cbb607 Fixes #388 - Provide pluggable RemoteEndpoint service 2016-06-06 07:44:46 -07:00
Greg Wilkins
b53f2eca7f longer test await time 2016-05-20 13:28:17 +10:00
Jesse McConnell
dc4574f380 [maven-release-plugin] prepare for next development iteration 2016-05-17 17:30:17 -05:00
Jesse McConnell
0bbebec1e0 [maven-release-plugin] prepare release jetty-9.3.9.v20160517 2016-05-17 17:30:13 -05:00
Jesse McConnell
d5c6793e6a [maven-release-plugin] prepare for next development iteration 2016-05-17 15:33:46 -05:00