1976 Commits

Author SHA1 Message Date
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
11d669092a Issue #1073 - JDK9 support in Jetty 9.3.x.
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +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
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
03a283235c Issue #1197 - adding testcase for Authorization use in WSClient 2016-12-27 13:32:21 -07: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
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
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
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
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
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
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
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
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
bc67969135 Fixes #1054 - NPE in Jetty WebSocketListener on PING frame with empty payload 2016-11-04 10:24:06 -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
Simone Bordet
0f97c3df5d Fixes #966 - Remove usages of ConcurrentArrayQueue. 2016-09-28 11:40:39 +02:00
Simone Bordet
efe339e246 Code cleanup. 2016-09-28 11:40:39 +02: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
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
28f557b0e1 Using maven-shade-plugin 2.4.3 now 2016-07-29 12:47:37 -07:00
Joakim Erdfelt
2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -07:00