Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 00:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,757 Commits 55 Branches 466 Tags
Commit Graph

330 Commits

Author SHA1 Message Date
Joakim Erdfelt
cb7ef89619 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-27 14:07:29 -07:00
Joakim Erdfelt
bf80d822c0 Issue #1202 - Adding testcase and fix for NPE in Sec-WebSocket-Extensions use 2016-12-27 14:06:33 -07:00
Joakim Erdfelt
7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt
680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Jesse McConnell
6a7e5dd4f5 Updating to version 9.4.1-SNAPSHOT 2016-12-08 09:41:50 -06:00
Jesse McConnell
c54efb5929 Updating to version 9.4.0.v20161208 2016-12-08 08:56:45 -06:00
Jesse McConnell
f8338b3f59 Updating to version 9.4.1-SNAPSHOT 2016-12-07 10:32:41 -06:00
Jesse McConnell
dac1d17a2d Updating to version 9.4.0.v20161207 2016-12-07 09:47:30 -06:00
Joakim Erdfelt
b70101b93f Fixes #117 - working build of WebSocketClient with HttpClient 
+ Proxy support exists now
 2016-12-01 15:00:41 -07:00
Joakim Erdfelt
709938e02b Merge branch 'issue-117' into jetty-9.4.x 2016-12-01 13:06:08 -07:00
Joakim Erdfelt
47fd7e1bd2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-30 14:41:43 -07:00
Joakim Erdfelt
70247d74d9 Issue #1124 - Fixing up merge issues 
+ Making WebSocketServletFactory always load a new
  WebSocketServerFactory
+ Making WebSocketServerFactory need a ServletContext
  to construct it, if appropriate (the WebSocketHandler
  approach doesn't use a ServletContext)
+ NativeWebSocketConfiguration is now a bean of
  ServerContainer
+ Removed WebSocketServletFactory.init(ServletContext) method
+ Renamed WebSocketServletFactory.init() to .start()
+ Renamed WebSocketServletFactory.cleanup() to .stop()
+ CDI & Websocket now works
+ Using a ServletContextListener now works
+ DecoderFactory and EncoderFactory now work
 2016-11-29 15:46:03 -07:00
Joakim Erdfelt
e329e386f0 Issue #117 - Carrying over the work from features/wsclient-httpclient 2016-11-28 15:45:38 -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
9a8ed0340c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-16 06:30:26 -07:00
Joakim Erdfelt
988e34489b Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-08-16 06:29:58 -07:00
Joakim Erdfelt
526d1415a4 Ignoring flappy test 2016-08-16 06:29:41 -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
2b947e8f72 Merge branch 'jetty-9.3.x' into release-9.3.10 2016-06-22 13:22:27 -05: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
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
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
3dca610f7b Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-13 23:39:23 +02:00
Simone Bordet
df2af60710 Fixes #640 - ClientContainer should store WebSocket sessions as beans. 2016-06-13 23:23:14 +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