513b5e5f90
Updating to version 9.2.21.v20170120
2017-01-20 12:32:00 -06:00
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06:00
9ae93c19ca
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-01-20 12:20:21 +01:00
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
a205fb3aae
Fixes #1276 - Remove org.eclipse.jetty.websocket.server.WebSocketServerFactory from SPI.
2017-01-20 09:55:01 +01:00
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd4565c186d7
2017-01-19 18:26:43 +01:00
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
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
25a1864de7
Issue #1229 - Adding testcase for WAR (expanded) with WEB-INF/lib/jetty-http.jar
2017-01-10 11:12:14 -04:00
bf80d822c0
Issue #1202 - Adding testcase and fix for NPE in Sec-WebSocket-Extensions use
2016-12-27 14:06:33 -07:00
03a283235c
Issue #1197 - adding testcase for Authorization use in WSClient
2016-12-27 13:32:21 -07:00
77c63a1648
Merge branch 'release-9.3.15' into jetty-9.3.x
2016-12-21 14:56:08 -07:00
b9fd70f5ad
Bumping up test timeouts
2016-12-20 14:31:56 -07:00
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
6b3b59df43
Updating to version 9.2.21-SNAPSHOT
2016-12-16 16:23:06 -07:00
bcbcee7f23
Updating to version 9.2.20.v20161216
2016-12-16 15:47:41 -07:00
c698c95e9b
Issue #1114 - removing redundant exportConfiguration
2016-12-15 10:44:34 -07:00
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
05f397caa4
Issue #1114 - Adding initial stop/start test logic
2016-12-14 13:20:28 -07:00
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
c7e139a8a6
fix typo in PathParamServerEndpointConfig javadoc ( #1145 )
...
Signed-off-by: Ben Duffield <bduffield@palantir.com>
2016-12-08 18:08:06 +11:00
fe493c2c06
Issue #1124
...
Fix classloading of WebSocketServerFactory for osgi.
2016-12-08 17:25:18 +11:00
63d93160f1
Issue #1124 - post review cleanup of changes with @sbordet
2016-11-30 10:16:25 -07:00
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
f54938178e
Merge branch 'jetty-9.2.x' into 'jetty-9.3.x'
2016-11-29 14:29:33 -07:00
c509a83d3b
Issue #1124 - adding more web.xml test cases
2016-11-25 07:38:20 -07:00
fb509eefe4
Resetting the field that marks the filter exported as a context attribute.
2016-11-25 15:10:32 +01:00
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
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
d361786e43
Issue #1118 - Eliminating .destroy() conflict
...
+ extending from AbstractLifeCycle instead of ContainerLifeCycle
2016-11-22 09:48:01 -07:00
7930a3dac8
Fixing merge 9.2.x -> 9.3.x
2016-11-16 18:31:33 -07:00
bfadca49b5
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-11-16 13:56:31 -07:00
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
2295bd59e3
Issue #1090 - Use WebSocketUpgradeFilter from WEB-INF/web.xml if present
2016-11-10 14:26:04 -07:00
9a6f68be78
Merge branch 'release-9.3.14' into jetty-9.3.x
2016-11-07 10:45:04 -06:00
bc67969135
Fixes #1054 - NPE in Jetty WebSocketListener on PING frame with empty payload
2016-11-04 10:24:06 -07:00
3a8cdc93d8
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-11-02 11:33:43 -07:00
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
2c38511828
Updating to version 9.3.15-SNAPSHOT
2016-10-28 13:01:34 -07:00
14611d2f76
Updating to version 9.3.14.v20161028
2016-10-28 12:21:02 -07:00
ade14ba34b
Updating to version 9.3.14-SNAPSHOT
2016-10-14 11:33:51 -07:00
c3a78e70a8
Updating to version 9.3.13.v20161014
2016-10-14 10:39:37 -07:00
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00:00
0f97c3df5d
Fixes #966 - Remove usages of ConcurrentArrayQueue.
2016-09-28 11:40:39 +02:00
efe339e246
Code cleanup.
2016-09-28 11:40:39 +02:00
6cf10172ca
Updating to version 9.3.13-SNAPSHOT
2016-09-15 07:34:52 -07:00
8b35fdc5a5
Updating to version 9.3.12.v20160915
2016-09-15 06:48:16 -07:00
fb7da26ad2
Updating to version 9.2.20-SNAPSHOT
2016-09-08 13:04:11 -07:00
7b94bc32f4
Updating to version 9.2.19.v20160908
2016-09-08 12:11:44 -07:00
988e34489b
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-08-16 06:29:58 -07:00
526d1415a4
Ignoring flappy test
2016-08-16 06:29:41 -07:00
28f557b0e1
Using maven-shade-plugin 2.4.3 now
2016-07-29 12:47:37 -07:00
2830e51e04
Merge branch 'jetty-9.3.x' into release-9.3.11
2016-07-28 12:20:36 -07:00
b3d25183b5
Fixes #780 - The moved websocket PathSpec is incompatible with cometd 3.0.x
2016-07-27 09:31:11 -07:00
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
0b18340179
Updating to version 9.2.19-SNAPSHOT
2016-07-21 13:10:23 -07:00
d3ff3423f0
Updating to version 9.2.18.v20160721
2016-07-21 12:35:26 -07:00
6a15bbfb2b
Issue #751 - Remove usages of ArrayQueue.
2016-07-21 17:55:48 +02:00
9d9df416af
Fixes #643 - NPE in passing websocket client test.
2016-06-23 13:00:04 +02:00
ae931538ab
[maven-release-plugin] prepare for next development iteration
2016-06-22 13:59:10 -05:00
df1ed4fb03
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 13:59:06 -05:00
2b947e8f72
Merge branch 'jetty-9.3.x' into release-9.3.10
2016-06-22 13:22:27 -05:00
b3635df543
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-06-22 10:43:27 -07:00
b2d6d06b48
Fixes #661 -JsrExtension is missing hashCode() and equals()
2016-06-22 10:42:31 -07:00
030ec61837
[maven-release-plugin] prepare for next development iteration
2016-06-22 09:14:25 -05:00
9a4cb41122
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 09:14:21 -05:00
f2264c96a6
Merge branch 'jetty-9.3.x' into release-9.3.10
2016-06-22 08:40:46 -05:00
e7034117ea
[maven-release-plugin] prepare for next development iteration
2016-06-21 08:50:13 -05:00
16c435c69d
[maven-release-plugin] prepare release jetty-9.3.10.v20160621
2016-06-21 08:50:09 -05:00
78c9010400
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-06-20 17:55:49 -07:00
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
0e5de87d49
Issue #663 Cleanup
...
Increased websocket tests timeouts
2016-06-15 18:04:33 +10:00
dc7bd636d0
Increased timeouts to avoid failures on slower machines.
2016-06-14 11:04:18 +02:00
fb76491ea0
Code cleanups.
2016-06-14 11:04:01 +02:00
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
df2af60710
Fixes #640 - ClientContainer should store WebSocket sessions as beans.
2016-06-13 23:23:14 +02:00
77de314ce1
Fixes #639 - ServerContainer stores WebSocket sessions twice.
...
ServerContainer now delegates session storage to WebSocketServerFactory.
2016-06-13 23:23:14 +02:00
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
e578c79b41
Code cleanups.
2016-06-13 23:23:14 +02:00
dd8afc34b9
Merge branch 'jetty-9.3.x' into bugs/388
2016-06-06 08:37:36 -07:00
8758cbb607
Fixes #388 - Provide pluggable RemoteEndpoint service
2016-06-06 07:44:46 -07:00
e9bb364eb2
Issue #609 ignore failing test
2016-06-01 16:16:39 +10:00
89232a6207
Fixes #605 - Guard concurrent calls to WebSocketSession.close().
...
Introduced an AtomicBoolean to guard AbstractWebSocketConnection.close().
Made IOState code more robust with respect to synchronization.
2016-05-31 18:28:12 +02:00
2e21234328
Code cleanups.
2016-05-31 18:23:51 +02:00
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
d5c6793e6a
[maven-release-plugin] prepare for next development iteration
2016-05-17 15:33:46 -05:00
0bab7e6616
[maven-release-plugin] prepare release jetty-9.2.17.v20160517
2016-05-17 15:33:42 -05:00
939505c342
Updating to version 9.2.17-SNAPSHOT
2016-04-14 14:03:21 -07:00
778fac638d
Updating to version 9.2.16.v20160414
2016-04-14 13:21:34 -07:00
47bbd9364d
Revert "Updating to version 9.2.16.v20160414"
...
This reverts commit 29ae63855b
2016-04-14 13:19:59 -07:00
29ae63855b
Updating to version 9.2.16.v20160414
2016-04-14 13:17:21 -07:00
5cd89d9efc
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-04-13 13:42:23 -07:00
f28c58044e
Fix #437 - updates to NPE prevention
2016-04-13 13:40:14 -07:00
Jesse McConnell
Simone Bordet
Joakim Erdfelt
Ben Duffield
Jan Bartel
Joakim Erdfelt
Greg Wilkins