1986 Commits

Author SHA1 Message Date
Greg Wilkins
764307b9a7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-02 13:59:01 +10:00
Joakim Erdfelt
3ea5c29ea6 Fixes #749 - Invalid WebSocket Upgrade should result in error 400, not 405 2016-08-01 10:06:22 -07:00
Jan Bartel
525fabd9aa Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-28 15:12:36 +10: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
Simone Bordet
8f5985e0e1 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-21 18:16:01 +02:00
Simone Bordet
823ba4add6 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-21 18:15:38 +02:00
Simone Bordet
6a15bbfb2b Issue #751 - Remove usages of ArrayQueue. 2016-07-21 17:55:48 +02:00
Simone Bordet
237502932a Merged branch 'jetty-9.4.x' into 'master'. 2016-06-23 13:04:06 +02:00
Simone Bordet
ab45979a13 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-23 13:02:53 +02:00
Simone Bordet
9d9df416af Fixes #643 - NPE in passing websocket client test. 2016-06-23 13:00:04 +02: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
2b947e8f72 Merge branch 'jetty-9.3.x' into release-9.3.10 2016-06-22 13:22:27 -05:00
Joakim Erdfelt
0a196e2123 Merge branch 'jetty-9.4.x' 2016-06-22 10:43:58 -07:00
Joakim Erdfelt
8157a4533c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-22 10:43:43 -07:00
Joakim Erdfelt
b3635df543 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-06-22 10:43:27 -07:00
Joakim Erdfelt
b2d6d06b48 Fixes #661 -JsrExtension is missing hashCode() and equals() 2016-06-22 10:42:31 -07: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
93b6dddae1 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-14 11:05:33 +02: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
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
df2af60710 Fixes #640 - ClientContainer should store WebSocket sessions as beans. 2016-06-13 23:23:14 +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
4f0741ac29 Temporarily commented out buggy clirr plugin.
Relevant issues:
+ mojohaus/clirr-maven-plugin#3 (fixed in 2.7)
+ mojohaus/clirr-maven-plugin#7
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
Simone Bordet
473c8f0c09 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-07 10:24:15 +02:00
Simone Bordet
73fe6715de Issue #306 - Merge jetty-parent into jetty-project.
Moved more plugin version declarations into jetty.project's pom.
2016-06-07 10:23:38 +02:00
Simone Bordet
2d1d3fe6e9 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-06 21:39:31 +02:00
Simone Bordet
a8f25b550f Fixes #487 - JDK 9 build compatibility.
Fixes #306 - Merge jetty-parent into jetty-project.

- Removed jetty.parent dependency, moving all relevant sections to
jetty.project's pom.xml.
- Introduced profiles for JDK 8 only modules and configuration, and
for JDK 9 only modules and configurations.
- Major cleanup of pom.xml files.
- All Maven Plugin now declared in alphabetical order in
pluginManagement section of jetty.project's pom.xml.
2016-06-06 21:28:51 +02: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
502f27f43e Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-03 16:22:17 +10:00