2237 Commits

Author SHA1 Message Date
Joakim Erdfelt
1441a1495b Fixes #1138 - Adding jetty-client dependency to websocket.mod 2016-12-16 09:27:56 -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
Simone Bordet
dd3a73e57a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-14 11:19:49 +01:00
Joakim Erdfelt
9b609e0f6d Issue #1161 - Leaving CookieStore alone HttpClient and WebSocketClient are stopped
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-12-14 09:00:12 +01: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
19333b8b3b Merge branch 'jetty-9.4.x' into release-9.4.0 2016-12-08 08:50:15 -06:00
Greg Wilkins
5186c1e6d0 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-12-08 18:35:40 +11:00
Ben Duffield
c7e139a8a6 fix typo in PathParamServerEndpointConfig javadoc (#1145)
Signed-off-by: Ben Duffield <bduffield@palantir.com>
2016-12-08 18:08:06 +11:00
Jan Bartel
fe493c2c06 Issue #1124
Fix classloading of WebSocketServerFactory for osgi.
2016-12-08 17:25:18 +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
Jan Bartel
936fd09a18 Issue #1124
Fix classloading of WebSocketServerFactory for osgi.
2016-12-05 09:42:44 +11:00
Greg Wilkins
d7aa079365 Issue #117 fixed javadoc errors 2016-12-02 15:33:30 +11:00
Greg Wilkins
4b82f54ad3 Issue #117 fixed javadoc errors 2016-12-02 14:34:37 +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
Joakim Erdfelt
47fd7e1bd2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-30 14:41:43 -07:00
Joakim Erdfelt
4b5e5566e8 Issue #117 - minor code review changes 2016-11-30 10:50:05 -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
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
Greg Wilkins
2ef23a6725 Issue #572
Improved to the toString and dump output of connections, endpoints and channel to assist with debugging
made the SSL callbacks and runnables Invocable to avoid thread starvation.
2016-11-23 16:58:35 +11: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
bc1f53a692 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-04 10:25:25 -07:00
Joakim Erdfelt
bc67969135 Fixes #1054 - NPE in Jetty WebSocketListener on PING frame with empty payload 2016-11-04 10:24:06 -07: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