Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,299 Commits 72 Branches 465 Tags 369 MiB
Commit Graph

913 Commits

Author SHA1 Message Date
Joakim Erdfelt acf743fa6b Issue #207 - Careful distinction between container policy, vs session policy 2017-02-28 13:05:29 -07:00
Joakim Erdfelt 523fab30bd Updating to version 9.4.3-SNAPSHOT 2017-02-20 08:13:31 -07:00
Joakim Erdfelt 4a674b9cc9 Updating to version 9.4.2.v20170220 2017-02-20 06:22:45 -07:00
Joakim Erdfelt 6adfa3c0a2 Fixing master tests (no longer need to specify Configuration) 2017-02-07 16:21:36 -07:00
Joakim Erdfelt 1338de9cfa Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-02-02 16:27:22 -07:00
Joakim Erdfelt 7f3ddf4edb Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:26:43 -07:00
Joakim Erdfelt 35b94fffd3 Improving touchy timeouts on slow machines 2017-02-02 16:25:42 -07:00
Joakim Erdfelt c5c7be2bc5 Merge branch 'jetty-9.4.x' 2017-02-02 16:23:13 -07:00
Joakim Erdfelt 5e57b9562f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:14:10 -07:00
Joakim Erdfelt 9a8f22d5dd Testing Updates 
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
  in jetty-test-helper and the test classes.
 2017-02-02 15:51:38 -07:00
Jesse McConnell e695fc80d6 Updating to version 9.2.22-SNAPSHOT 2017-01-20 12:32:51 -06:00
Jesse McConnell 513b5e5f90 Updating to version 9.2.21.v20170120 2017-01-20 12:32:00 -06:00
Jesse McConnell d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell 556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00
Jesse McConnell 66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell df03355d00 Updating to version 9.3.16.v20170120 2017-01-20 09:06:48 -06:00
Simone Bordet 84b57c5f07 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-20 12:32:18 +01:00
Simone Bordet ee17396cee Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-20 12:27:29 +01:00
Simone Bordet 9ae93c19ca Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-01-20 12:20:21 +01:00
Simone Bordet 51f68dc57e Issue #1229 - ClassLoader constraint issue when using NativeWebSocketConfiguration with WEB-INF/lib/jetty-http.jar present. 
Introduced String-based APIs to specify mappings, to avoid the
classloader issue.
 2017-01-20 11:34:29 +01:00
Simone Bordet a205fb3aae Fixes #1276 - Remove org.eclipse.jetty.websocket.server.WebSocketServerFactory from SPI. 2017-01-20 09:55:01 +01:00
Simone Bordet cef2ff9522 Happy New Year 2017. 2017-01-19 19:31:53 +01:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers" 
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
 2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Simone Bordet b7b3dfdc77 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-12 17:53:09 +01:00
Greg Wilkins 611e79945c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-11 18:10:50 +11:00
Joakim Erdfelt 7e3d3604ac Merge pull request #1219 from violetagg/ws-suspend-resume 
Issue #1218 - When resuming a suspended connection do not register a …
 2017-01-10 17:24:12 -04:00
Joakim Erdfelt 487748cd8f Issue #1207 - Making EventDriver use WebSocketContainerScope instead 2017-01-10 16:27:49 +01:00
Joakim Erdfelt 25a1864de7 Issue #1229 - Adding testcase for WAR (expanded) with WEB-INF/lib/jetty-http.jar 2017-01-10 11:12:14 -04:00
Simone Bordet a51f800054 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-10 15:07:26 +01:00
Violeta Georgieva eaa51be083 Issue #1218 - When resuming a suspended connection do not register a read interest if currently in filling mode. 
Signed-off-by: Violeta Georgieva <vgeorgieva@pivotal.io>
 2017-01-05 14:58:06 +02:00
Joakim Erdfelt 0fc897233a Fixes #1216 to prevent duplicate SCI initialization of WSUF 2017-01-04 11:30:19 -04:00
Joakim Erdfelt 9324971d20 Issue #1216 improving init/destroy in WSUF 2017-01-04 10:42:51 -04:00
Joakim Erdfelt ecc3c57dd1 Issue #1214 - Ensure all response headers are present 2017-01-04 10:10:23 -04:00
Joakim Erdfelt 77c63a1648 Merge branch 'release-9.3.15' into jetty-9.3.x 2016-12-21 14:56:08 -07:00
Joakim Erdfelt 243c24338f Merge branch 'jetty-9.4.x' 2016-12-20 15:38:51 -07:00
Joakim Erdfelt 64f714689e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-20 15:38:36 -07:00
Joakim Erdfelt b9fd70f5ad Bumping up test timeouts 2016-12-20 14:31:56 -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
Joakim Erdfelt 6b3b59df43 Updating to version 9.2.21-SNAPSHOT 2016-12-16 16:23:06 -07:00
Joakim Erdfelt bcbcee7f23 Updating to version 9.2.20.v20161216 2016-12-16 15:47:41 -07:00
Joakim Erdfelt 1c16964118 Merge branch 'jetty-9.4.x' 2016-12-16 08:38:16 -07:00
Joakim Erdfelt 44596a7714 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-16 08:38:01 -07:00
Joakim Erdfelt c698c95e9b Issue #1114 - removing redundant exportConfiguration 2016-12-15 10:44:34 -07:00
Joakim Erdfelt bd104d59f9 Issue #1114 - persisting NativeWebSocketConfiguration mappings 
+ Mappings are persisted if added to the NativeWebSocketConfiguration
  before that configuration is started.  Otherwise they are cleared
  out on configuration.stop() lifecycle (like before)
 2016-12-14 15:31:23 -07:00
Joakim Erdfelt 05f397caa4 Issue #1114 - Adding initial stop/start test logic 2016-12-14 13:20:28 -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
Jan Bartel c02dec5654 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-08 11:31:00 +11: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
Greg Wilkins a4884f0c2d Issue #117 
Fixed Upgrade Response to make a distinction between when headers are available from a response and when they are copied to and copied from the real response.
This exposed the fact that the extension header was being set twice. Fixed that and now test webapp works again.
 2016-12-05 17:43:47 +11:00
Greg Wilkins 4046ef26d3 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-02 13:35:16 +11: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
Jan Bartel 4d7a629e1b Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-01 12:07:07 +11: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 63d93160f1 Issue #1124 - post review cleanup of changes with @sbordet 2016-11-30 10:16:25 -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 f54938178e Merge branch 'jetty-9.2.x' into 'jetty-9.3.x' 2016-11-29 14:29:33 -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 c509a83d3b Issue #1124 - adding more web.xml test cases 2016-11-25 07:38:20 -07:00
Simone Bordet fb509eefe4 Resetting the field that marks the filter exported as a context attribute. 2016-11-25 15:10:32 +01:00
Joakim Erdfelt a3f32911fa Issue #1124 - WebSocketUpgradeFilter + ServletContextListener 
+ Now Spring and its initialization of WebSocketUpgradeFilter
  can work.
+ Improves life for cometd 3.1.0 as well
 2016-11-23 19:55:36 -07:00
Simone Bordet 23753759bb Merged branch 'jetty-9.4.x' into 'master'. 2016-11-23 12:19:31 +01:00
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
Greg Wilkins bf3ea9ae44 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-18 11:19:40 +11: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 fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -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
Joakim Erdfelt 512e0ec076 Issue #207 - Using connection idle-timeout declared in annotation 2016-10-12 11:14:15 -07:00
Joakim Erdfelt 34f0007153 Fixing up testcase reporting 2016-10-12 11:11:58 -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 0a99c20a73 Issue #207 - Support javax.websocket version 1.1 
+ Cleaning up WebSocketPolicy usage
 2016-08-23 16:57:09 -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 de7c7ca7af Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:21:33 -07:00
Joakim Erdfelt 390c6924dd Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 39f2ba3b56 Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt e50cabf305 Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 8784a1f850 Issue #207 - Support javax.websocket version 1.1 
WIP
 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 31328b8f66 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 2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -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
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 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 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
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 e5a05bca0a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-20 15:18:26 +10: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
Jesse McConnell 0bab7e6616 [maven-release-plugin] prepare release jetty-9.2.17.v20160517 2016-05-17 15:33:42 -05:00
Greg Wilkins a5ad291add Squashed commit of the following: (#528) 
commit 4bf6b7c951
Merge: a50e882 301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Apr 27 12:12:08 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit a50e8825a3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 23 09:38:00 2016 +1000

    work in progress

commit 4e286266c0
Merge: 5ae7da0 f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 21 16:34:12 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5ae7da049b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 21 12:12:24 2016 +1000

    Work in progress on Features

commit adfc430ad4
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Apr 20 22:05:55 2016 +1000

    Refactor Configurations.isEnabledByDefault, enable all configurations by default.

commit 70cca692cc
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Apr 20 17:32:22 2016 +1000

    Fix features for jsp with osgi

commit 22d2b251e9
Merge: 571d503 2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 14 16:19:43 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 571d50315e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Apr 13 15:36:36 2016 +1000

    code comment

commit d9b229f298
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 9 21:24:22 2016 +1000

    fixed quickstart validation

commit 154d58bf62
Merge: 8e54aad ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 18:25:17 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 8e54aad414
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 18:21:30 2016 +1000

    general cleanup of Configuration and ClasspathPattern usage

commit 65f8e5dbd0
Merge: ea1deda 2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 09:15:28 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit ea1deda4f9
Merge: cfe9c83 f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 18:21:56 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit cfe9c83691
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 17:57:23 2016 +1100

    work in progress

commit 725be8c051
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 10:11:49 2016 +1100

    work in progress

commit 61d2c07534
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 14:01:00 2016 +1100

    progress on OSGi

commit a977536c7d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:52:33 2016 +1100

    Fixed plugin

commit f08b84ba0e
Merge: f19bd2c 8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:21:55 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit f19bd2c65a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:21:06 2016 +1100

    work in progress... all but OSGi

commit 2f15c3e4f9
Merge: 36b5687 7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 16:52:43 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 36b5687329
Merge: 13d914a e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 07:20:05 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 13d914aa7c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 04:41:30 2016 +1100

    Work in progress on Features

    Moved jar discovery to META-INF

commit d41bd264ad
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 17:48:15 2016 +0100

    Work in progress towards new quickstart arch

commit c5c23698c4
Merge: fd34007 692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 11:29:18 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit fd34007c3d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 11:04:35 2016 +0100

    Work in progress on Features for QuickStart

commit c5f0c80cd2
Merge: 0e6d886 b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 4 16:05:23 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 0e6d886b01
Merge: d150405 2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Mar 2 17:32:36 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit d1504055de
Merge: 22a6cd0 3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Mar 2 15:21:20 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 22a6cd05b7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Feb 29 20:53:17 2016 +0100

    Features work in progress

    convert more server/system classes to Configurations

commit 037e04bfe5
Merge: add9876 bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Feb 29 17:11:04 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit add9876f83
Merge: 5263f15 eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Feb 25 10:11:08 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5263f15acd
Merge: 89803ae 21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 23 14:35:31 2016 +0100

    Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature

commit 89803aec95
Merge: 5fed7c7 779317d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 16:09:38 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5fed7c713f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 11:21:13 2016 +0100

    fixed merge

commit ec22a1ba0b
Merge: 4c8257d d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 10:53:16 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 4c8257d23b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 17 09:34:28 2015 +1100

    Do not default quickstart

commit 57ce87770a
Merge: 14bde1f 96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Dec 16 17:16:14 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 14bde1f696
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 16:26:58 2015 +1100

    work in progress on Configurations as services

commit 46ce2aef3a
Merge: 9e82fa0 ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 10:11:09 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 9e82fa0a22
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 08:52:37 2015 +1100

    work in progress to Configurations as ServiceLoader

commit 6e11f22de4
Merge: 120e330 5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 3 18:16:14 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 120e33034f
Merge: 6c5b95d 384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 3 14:20:52 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 6c5b95d6b8
Merge: 722eb60 5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Dec 2 11:16:37 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 722eb60ce5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 27 13:58:16 2015 +1100

    Configurations can add server/system classes

commit 2972354db7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 27 11:47:03 2015 +1100

    Self ordering WebApp Configurations

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2016-05-02 17:55:54 +10:00
Joakim Erdfelt c09f31a51d Bumping up master to version 10.0.0-SNAPSHOT 2016-04-29 11:47:15 -07:00
Joakim Erdfelt 939505c342 Updating to version 9.2.17-SNAPSHOT 2016-04-14 14:03:21 -07:00
Joakim Erdfelt 778fac638d Updating to version 9.2.16.v20160414 2016-04-14 13:21:34 -07:00
Joakim Erdfelt 47bbd9364d Revert "Updating to version 9.2.16.v20160414" 
This reverts commit 29ae63855b.
 2016-04-14 13:19:59 -07:00
Joakim Erdfelt 29ae63855b Updating to version 9.2.16.v20160414 2016-04-14 13:17:21 -07:00
Joakim Erdfelt 6fb338e50d Updating to version 9.3.9-SNAPSHOT 2016-04-11 16:20:50 -07:00
Joakim Erdfelt bb4f3c4882 Updating to version 9.3.9.M1 2016-04-11 15:35:22 -07:00
Joakim Erdfelt 3624339ec6 Merge branch 'jetty-9.3.x' 2016-03-16 10:29:29 -07:00
Joakim Erdfelt 13fde643ed Merge branch 'release-9.3.8' into jetty-9.3.x 2016-03-16 10:03:29 -07:00
Greg Wilkins 1c5a1fc6a2 Issue #431 
Suppress stack traces from unit tests
 2016-03-16 18:19:40 +11:00
Joakim Erdfelt 132307e604 Merge branch 'jetty-9.3.x' 2016-03-15 11:50:31 -07:00
Joakim Erdfelt 464c46a757 Issue #427 - Squelch intentional exceptions seen during websocket testing 2016-03-15 09:20:34 -07:00
Joakim Erdfelt c68d3b1d8d Updating to version 9.3.9-SNAPSHOT 2016-03-14 09:07:52 -07:00
Joakim Erdfelt 1f3b3f31f4 Updating to version 9.3.8.v20160314 2016-03-14 08:30:20 -07:00
Joakim Erdfelt f98dde5e5b Updating to version 9.2.16-SNAPSHOT 2016-02-10 15:36:41 -07:00
Joakim Erdfelt 9b6890d3c1 Updating to version 9.2.15.v20160210 2016-02-10 14:49:12 -07:00
Simone Bordet 56c0bc768c Merged branch 'jetty9.3.x' into 'master'. 2016-01-21 17:52:37 +01:00
Joakim Erdfelt e0ce545ad7 Updating to version 9.3.8-SNAPSHOT 2016-01-15 17:15:14 -07:00
Joakim Erdfelt c0b191119b Updating to version 9.3.7.v20160115 2016-01-15 16:40:15 -07:00
Joakim Erdfelt 9f8df9a1a8 485969 - WebSocket upgrade response should honor HttpConfiguration server version settings 2016-01-15 13:23:43 -07:00
Greg Wilkins c5cbc64e77 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-01-14 11:00:06 +11:00
Joakim Erdfelt b7f9c9aca9 Updating to version 9.3.7-SNAPSHOT 2016-01-13 08:21:01 -07:00
Joakim Erdfelt 21ca3f6690 Updating to version 9.3.7.RC1 2016-01-13 07:30:24 -07:00
Joakim Erdfelt 57224ec3ca 481986 - Dead JSR 356 Server Session still being tracked after Session/Connection closure 
+ Removing SessionListener
+ Work in CDI layer for WebSocketContainerScope is reused for
  session tracking on the parent scope of the WebSocketSession only.
  no more multi-listener behavior
+ Reworked JsrSession ID behavior to not be based on AtomicLong
+ AbstractWebSocketConnection now has .hashCode and .equals
 2016-01-12 16:15:51 -07:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Joakim Erdfelt 31cd3fee84 Merge branch 'jetty-9.3.x' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathSpecSet.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
 2015-12-17 12:51:57 -07:00
Joakim Erdfelt 3bec195d08 484440 - Swap WebSocket PathMappings for new jetty-http PathMappings 
+ Deprecated jetty-server ServletPathSpec and RegexPathSpec
+ Moved all other code to using new jetty-http versions
 2015-12-17 11:42:27 -07:00
Simone Bordet 9aa6dc1e7d Merged branch 'jetty-9.3.x' into 'master'. 2015-12-08 13:02:55 +01:00
Joakim Erdfelt b9c1535552 481567 - permessage-deflate causing data-dependent ju.zip.DataFormatException: invalid stored block lengths 
+ Reworked PerMessageDeflateExtensionTest to test with different
  modes (http/ws vs https/wss), different messages sizes, and
  input buffer sizes (these various configurations do trigger
  the reported bug)
+ Made CompressExtension loop over the input buffer if the buffer
  happens to not be entirely consumed.
 2015-12-07 13:15:29 -07:00
Joakim Erdfelt 97722aeea8 Merge branch 'jetty-9.3.x' 2015-12-02 12:20:06 -07:00
Joakim Erdfelt bae1138211 Fixing test expectations on Decorator counts 2015-12-02 12:19:52 -07:00
Greg Wilkins a311c8bde1 480904 - jetty-util Loader simplification 
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader.    Multiple loaders will never be tried.

A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).

The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
 2015-11-19 12:14:05 +11:00
Joakim Erdfelt edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Joakim Erdfelt 4dfd68b315 Merge branch 'jetty-9.3.x' 
Conflicts:
	aggregates/jetty-all-compact3/pom.xml
	aggregates/jetty-all/pom.xml
	apache-jsp/pom.xml
	apache-jstl/pom.xml
	examples/async-rest/async-rest-jar/pom.xml
	examples/async-rest/async-rest-webapp/pom.xml
	examples/async-rest/pom.xml
	examples/embedded/pom.xml
	examples/pom.xml
	jetty-alpn/jetty-alpn-client/pom.xml
	jetty-alpn/jetty-alpn-server/pom.xml
	jetty-alpn/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-cdi/cdi-core/pom.xml
	jetty-cdi/cdi-full-servlet/pom.xml
	jetty-cdi/cdi-servlet/pom.xml
	jetty-cdi/cdi-websocket/pom.xml
	jetty-cdi/pom.xml
	jetty-cdi/test-cdi-webapp/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-fcgi/fcgi-client/pom.xml
	jetty-fcgi/fcgi-server/pom.xml
	jetty-fcgi/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http2/http2-alpn-tests/pom.xml
	jetty-http2/http2-client/pom.xml
	jetty-http2/http2-common/pom.xml
	jetty-http2/http2-hpack/pom.xml
	jetty-http2/http2-http-client-transport/pom.xml
	jetty-http2/http2-server/pom.xml
	jetty-http2/pom.xml
	jetty-infinispan/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-alpn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-quickstart/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/javax-websocket-client-impl/pom.xml
	jetty-websocket/javax-websocket-server-impl/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/pom.xml
	tests/test-http-client-transport/pom.xml
	tests/test-integration/pom.xml
	tests/test-jmx/jmx-webapp-it/pom.xml
	tests/test-jmx/jmx-webapp/pom.xml
	tests/test-jmx/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-quickstart/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-infinispan-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
 2015-10-13 08:53:35 -07:00
Joakim Erdfelt dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00
Joakim Erdfelt 29722bd880 Updating to version 9.3.5.v20151012 2015-10-12 15:10:39 -07:00
Joakim Erdfelt b4456d96dd Disabling flappy test 2015-10-09 10:14:35 -07:00
Joakim Erdfelt 2cce7510e1 Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00
Joakim Erdfelt 9cf0e34a1d Updating to version 9.4.0-SNAPSHOT 2015-10-07 15:41:32 -07:00
Joakim Erdfelt 37296bec3c Updating to version 9.3.4.v20151007 2015-10-07 14:58:38 -07:00
Joakim Erdfelt cd17ff932a 478829 - WebsocketSession not cleaned up / memory leak 
+ WebSocket Connection objects no longer need to
  hold a reference to the WebSocketSession object
  eliminating another reference to the WebSocketSession
  that could hold GC efforts to clean it up
 2015-10-02 10:33:32 -07:00
Joakim Erdfelt 1e8d0db743 478829 - WebsocketSession not cleaned up / memory leak 
+ Reducing looping references Session -> otherObj -> Session
 + Using Container LifeCycle bean management more consistently
 + All sessions are now child beans
 + A stopped session that hasn't been closed, will auto-close now
 + Using SessionListener more consistently
 + Client ConnectionManager no longer tracks Sessions
 + EventDriver stop cleans up its Session references
 + Moving all DummyConnection test classes to websocket-common:tests
 2015-10-01 18:18:20 -07:00
Joakim Erdfelt b865b50cb6 Extracting IBlockheadClient for refactoring prep 2015-09-30 12:47:31 -07:00
Joakim Erdfelt 3901fcbb60 474936 - WebSocketSessions are not always cleaned out from openSessions 
+ Adding additional testcase to verify behavior
 2015-09-22 14:54:18 -07:00
Jan Bartel 03a601f2b2 477385 Make jetty osgi manifests only resolve jetty packages against a single distro version 2015-09-16 19:13:47 +10:00
Jesse McConnell 20ffd0dd0b Merge branch 'release-9.3.3' 2015-08-31 13:41:21 -05:00
Joakim Erdfelt 6fad345161 475209 - WebSocketServerFactory should not hand null object to DecoratedObjectFactory 2015-08-27 15:36:57 -07:00
Joakim Erdfelt 9c855bee76 474936 - WebSocketSessions are not always cleaned out from openSessions 
+ Adding testcase
+ Enabling Connection.onClose() -> ioState.onDisconnected()

Conflicts:
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketCloseTest.java
 2015-08-27 09:33:28 -07:00
Jesse McConnell 6409366499 [maven-release-plugin] prepare for next development iteration 2015-08-27 10:11:29 -05:00
Jesse McConnell 3086adc965 [maven-release-plugin] prepare release jetty-9.3.3.v20150827 2015-08-27 10:11:21 -05:00
Jesse McConnell be35fd72cd ignore 2015-08-27 09:40:45 -05:00
Jesse McConnell 3a975426bf @Ignore for release 2015-08-27 09:17:45 -05:00
Jesse McConnell f5d1fb1058 Merge branch 'master' into release-9.3.3 2015-08-27 08:31:22 -05:00