020a980394
Merge pull request #3155 from eclipse/jetty-9.4.x-issue-3139-npe-websocket-sci
...
Fixes #3139 - NPE in WebSocketContainerInitializer
2019-01-08 15:57:35 -06:00
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
a703fc626b
Fixes #3139 - NPE in WebSocketContainerInitializer
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-27 14:42:30 -06:00
29fd18e046
Updating to version 9.4.15-SNAPSHOT
2018-11-14 16:42:40 -06:00
c4550056e7
Updating to version 9.4.14.v20181114
2018-11-14 15:19:10 -06:00
a903017f5f
Updating to version 9.4.14-SNAPSHOT
2018-11-11 21:06:50 -06:00
49123a3313
Updating to version 9.4.13.v20181111
2018-11-11 20:02:42 -06:00
a3f1592c50
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 10:07:17 +10:00
863a19bccf
Updating to version 9.3.26-SNAPSHOT
2018-09-04 17:23:31 -05:00
3ce520221d
Updating to version 9.3.25.v20180904
2018-09-04 16:08:21 -05:00
dcf6a8fa9f
Updating to version 9.4.13-SNAPSHOT
2018-08-30 10:48:22 -05:00
2720868475
Updating to version 9.4.12.v20180830
2018-08-30 08:56:44 -05:00
a107ac3b8a
Ensure Client ContainerProvider behavior is reset properly.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-10 11:14:10 -05:00
9a4b780781
Issue #2767 - WebSocket Policy on JSR356 ClientContainer not represented correctly
...
+ Added Client unit tests for large messages
+ Re-enabled Server unit tests for large messages
+ Added more Server unit tests for large messages
+ In case of JSR356 Server with policy (and Behavior of SERVER)
is controlling javax.websocker.server.ServerContainer
and a user chooses to use that ServerContainer to
connect to a remote websocket endpoint (using ServerContainer
as a client), then the policy is delegated down to the
Client Container with a different behavior (only).
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-06 15:21:22 -05:00
516d93c488
Updating to version 9.2.27-SNAPSHOT
2018-08-06 11:33:22 -05:00
8c637489ae
Updating to version 9.2.26.v20180806
2018-08-06 10:51:25 -05:00
0b69f00665
Updating to version 9.4.12-SNAPSHOT
2018-07-11 17:32:16 -05:00
260596dd10
Updating to version 9.4.12.RC0
2018-07-11 16:30:55 -05:00
2e5f106285
Issue #2655 - Applying changes requested from review.
...
+ WebSocketClient all constructors now delegate down into one
implementation
+ NativeWebSocketServletConfiguration is now managed properly
+ WebSocketServletFactory can find Executor as bean too
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-20 12:59:23 -05:00
870c87f2f7
Issue #2655 - Removing closed WebSocket Session's from WebSocketClient
...
+ Correcting Native WebSocketConfiguration impact.
+ CDI requires a customized DecoratedObjectFactory, which is bound
later in the lifecycle, which means we cannot rely on it being
provided directly in the constructors, but rather have to look
for it in the ServletContext.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-13 16:53:14 -05:00
0e6c91b604
Updating to version 9.2.26-SNAPSHOT
2018-06-06 18:54:58 -05:00
4830fd15e9
Updating to version 9.2.25.v20180606
2018-06-06 16:42:54 -05:00
e4bfe00dce
Updating to version 9.4.12-SNAPSHOT
2018-06-05 14:18:37 -05:00
d5fc0523cf
Updating to version 9.4.11.v20180605
2018-06-05 13:23:02 -05:00
5eefa90e05
Updating to version 9.3.25-SNAPSHOT
2018-06-05 13:13:07 -05:00
84205aa28f
Updating to version 9.3.24.v20180605
2018-06-05 12:11:03 -05:00
f0ff571c98
Reverting version to 9.3.24-SNAPSHOT
2018-06-05 12:06:58 -05:00
13640c297c
Bumping version to 9.3.25-SNAPSHOT
2018-06-05 11:58:37 -05:00
69aaabac24
fixes to printed exception stack traces in tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-29 17:55:14 +10:00
a6547eaf83
Issue #2559 - Use Configurator declared in ServerEndpointConfig over @ServerEndpoint annotation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-25 06:29:33 -05:00
bc16b6efae
Issue #2559 - Use Configurator declared in ServerEndpointConfig over @ServerEndpoint annotation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-22 09:44:20 -05:00
1732ffca51
Updating to version 9.4.11-SNAPSHOT
2018-05-03 11:48:05 -05:00
daa59876e6
Updating to version 9.4.10.v20180503
2018-05-03 10:55:19 -05:00
0e88849a68
Issue #2164 Make osgi.serviceloader mostly optional ( #2408 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-04-18 14:48:53 +10:00
f36eba4577
class.newInstance is deprecated #2435 ( #2437 )
...
* Class.newInstance() is deprecated in Java 9+ #2435
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-17 19:07:20 +10:00
c3cc138a3b
Updating to version 9.4.10-SNAPSHOT
2018-03-20 08:25:59 -05:00
1f8159b1e4
Updating to version 9.4.9.v20180320
2018-03-20 07:18:24 -05:00
534b8ea38b
Add edit warning for .mod files. Resolves #173
2018-03-15 13:23:42 -04:00
dd57cf0bf6
Issue #2282 - Simplifying BlockheadClient to drastically reduce CPU load during testing
2018-03-06 21:01:39 -06:00
1373025dff
Issue #2282 - removing EventQueue from websocket tests
2018-03-05 17:52:23 -06:00
076f3a8ab2
Issue #2269 - reworking SessionTest to be more resilient
2018-03-05 14:34:23 -06:00
a639ee9275
Resolved errorprone MissingOverride warnings #2206
...
`@Override` was added to methods which were missing the annotation #2206
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-01 13:59:25 +11:00
a05b157c03
Updating to version 9.3.24-SNAPSHOT
2018-02-28 16:39:30 -06:00
0554f8d8b4
Updating to version 9.3.23.v20180228
2018-02-28 15:45:57 -06:00
dc87eec9bd
Fixes #2246 - Reworking await for messages to be more resilient
2018-02-26 13:33:30 -06:00
1e8422935c
Issue #2164 Add test for javax.websocket in osgi
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-20 16:28:39 +11:00
3001c8af2f
Merge remote-tracking branch 'origin/release-9.2.24' into jetty-9.2.x
2018-02-07 15:35:04 -06:00
21365234f8
Issue #2108 - Updating license headers for year 2018
2018-01-09 09:44:41 -06:00
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
067fc5d2d8
Issue #2108 - Upgrade licenses for 2018
2018-01-09 07:42:06 -06:00
083c8045e8
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 16:10:52 +11:00
bd01e1877a
Updating to version 9.2.25-SNAPSHOT
2018-01-05 11:35:42 -06:00
a617842695
Updating to version 9.2.24.v20180105
2018-01-05 10:11:08 -06:00
2dd970b055
Updating to version 9.2.24-SNAPSHOT
2017-12-18 10:43:47 -06:00
cdbe733684
Updating to version 9.2.23.v20171218
2017-12-18 09:06:48 -06:00
ff53002fac
Updating to version 9.4.9-SNAPSHOT
2017-11-21 13:11:31 -07:00
82b8fb23f7
Updating to version 9.4.8.v20171121
2017-11-21 12:33:52 -07:00
a72eb0001d
Updating to version 9.3.23-SNAPSHOT
2017-10-30 15:39:57 -05:00
705048cc49
Updating to version 9.3.22.v20171030
2017-10-30 15:16:29 -05:00
d9865a02ba
Updating to version 9.4.8-SNAPSHOT
2017-09-14 08:44:27 -07:00
80fb788d0c
Updating to version 9.4.7.v20170914
2017-09-14 07:35:18 -07:00
acc7c97969
Removing @Rule LeakTrackingBufferPoolRule - bad threading behavior / false positives
2017-09-06 10:16:32 -07:00
752fda19b9
Fixes #1767 - removing debug output from testing
2017-09-06 10:14:49 -07:00
9f28d26cff
Fixed #1766 - Fixing test case results
2017-08-23 15:58:22 -07:00
b0fd444a1b
File EOL issue, post-hard reset
2017-08-09 14:31:06 -07:00
54367621e4
Fixing cdi/websocket pom versions
2017-08-08 09:54:09 -07:00
3fdbcffbbd
Updating to version 9.2.23-SNAPSHOT
2017-08-08 09:12:55 -07:00
a7bcac6d75
Updating to version 9.3.20.v20170531
2017-08-08 09:07:35 -07:00
af4962f842
Issue #1605 - common executor and bufferpool for jsr356 client
2017-08-08 08:49:57 -07:00
0de3673132
Issue #1605 - restoring default behavior of ContainerProvider.getWebSocketContainer()
...
+ Allowing users to reconfigure JettyClientContainerProvider to restore
the Jetty 9.4.x behavior for singletons and ServerContainer behaviors
2017-08-08 08:49:57 -07:00
11a544d6ac
Updating to version 9.3.22-SNAPSHOT
2017-08-01 11:26:37 -07:00
bb1d69ca52
Updating to version 9.3.21.M0
2017-08-01 10:47:04 -07:00
4d2c299fe8
Updating to version 9.2.23-SNAPSHOT
2017-06-06 08:55:12 -07:00
0af30bce5a
Updating to version 9.2.22.v20170606
2017-06-06 07:03:05 -07:00
6a3c40e935
Updating to version 9.4.7-SNAPSHOT
2017-05-31 17:26:34 -07:00
8ba0f2d95d
Updating to version 9.4.6.v20170531
2017-05-31 16:22:52 -07:00
429380d36a
Updating to version 9.3.21-SNAPSHOT
2017-05-31 16:10:04 -07:00
0f3b1cbe36
Updating to version 9.3.20.v20170531
2017-05-31 15:24:57 -07:00
0f98e607e8
Issue #1514 - fixing bad websocket dump output
2017-05-31 13:36:27 -07:00
e3bab3df22
Issue #1528 - Use WebSocketContainer out of current context
...
+ Interrogate ServletContext, ContextHandler, and Context
for an active ServerContainer before returning a new ClientContainer
2017-05-19 13:50:40 -07:00
e001fe0355
Issue #1528 - pull preconfigured HttpClient from attributes
...
+ Search ServletContext attributes first
+ Search Server attributes next
2017-05-19 08:27:53 -07:00
7b2a0e380d
Using ThreadClassLoaderScope
2017-05-18 16:13:16 -07:00
9b4bfbc680
Issue #1544 - Identifying context that JSR-356 was disabled for in configuration
2017-05-18 14:03:16 -07:00
c75e3c19d9
Issue #1516 - making WebSocket started thread pools have identifying names
2017-05-11 09:52:02 -07:00
2679715a30
Silencing bogus JSR356 IdleTimeoutTest warning
2017-05-10 12:13:24 -07:00
a7b164e6b9
Fixing JSR356 Client tests
2017-05-10 07:46:56 -07:00
753ed9e603
Issue #1516 - Delay starting of WebSocketClient
2017-05-09 12:58:22 -07:00
cf56168f7d
Updating to version 9.3.20-SNAPSHOT
2017-05-02 15:26:56 -07:00
d36d57d5c7
Updating to version 9.3.19.v20170502
2017-05-02 14:31:51 -07:00
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
0195812f18
Disabling more flaky tests that are fixed in issue-207 branch
2017-04-26 11:34:57 -07:00
240b82be70
Disabling currently flaky tests that are fixed in issue-207 branch
2017-04-26 08:45:59 -07:00
4c5dd93b30
Issue #1502 - Changing WSUF target creation used by PathMappings match
2017-04-24 16:08:37 -07:00
92ea5bda21
Updating to version 9.4.5-SNAPSHOT
2017-04-14 14:43:36 -07:00
3dc8f557c6
Updating to version 9.4.4.v20170414
2017-04-14 13:20:17 -07:00
9e2aeda052
Updating to version 9.3.19-SNAPSHOT
2017-04-06 07:47:53 -07:00
63273aa40b
Updating to version 9.3.18.v20170406
2017-04-06 06:31:02 -07:00
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
a6a0ab991f
Updating to version 9.3.18-SNAPSHOT
2017-03-17 09:48:19 -07:00
307d23975e
Updating to version 9.3.17.v20170317
2017-03-17 09:07:39 -07:00
ab5e94f86b
Fixing system locale dependent test
...
Signed-off-by: Stefan Schmidt <stefanschmidt@web.de>
2017-03-11 12:22:02 +01:00
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
5e57b9562f
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:14:10 -07:00
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
e695fc80d6
Updating to version 9.2.22-SNAPSHOT
2017-01-20 12:32:51 -06:00
513b5e5f90
Updating to version 9.2.21.v20170120
2017-01-20 12:32:00 -06:00
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -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
ee17396cee
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-20 12:27:29 +01: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
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +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
487748cd8f
Issue #1207 - Making EventDriver use WebSocketContainerScope instead
2017-01-10 16:27:49 +01:00
0fc897233a
Fixes #1216 to prevent duplicate SCI initialization of WSUF
2017-01-04 11:30:19 -04:00
cb7ef89619
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-27 14:07:29 -07:00
bf80d822c0
Issue #1202 - Adding testcase and fix for NPE in Sec-WebSocket-Extensions use
2016-12-27 14:06:33 -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
1441a1495b
Fixes #1138 - Adding jetty-client dependency to websocket.mod
2016-12-16 09:27:56 -07:00
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
19333b8b3b
Merge branch 'jetty-9.4.x' into release-9.4.0
2016-12-08 08:50:15 -06:00
5186c1e6d0
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-12-08 18:35:40 +11:00
c7e139a8a6
fix typo in PathParamServerEndpointConfig javadoc ( #1145 )
...
Signed-off-by: Ben Duffield <bduffield@palantir.com>
2016-12-08 18:08:06 +11:00
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
b70101b93f
Fixes #117 - working build of WebSocketClient with HttpClient
...
+ Proxy support exists now
2016-12-01 15:00:41 -07:00
47fd7e1bd2
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-30 14:41:43 -07: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
a73e466e4d
Issue #1124 - WebSocketUpgradeFilter + ServletContextListener
...
+ Now Spring and its initialization of WebSocketUpgradeFilter
can work.
+ Improves life for cometd 3.1.0 as well
2016-11-25 15:39:02 +01:00
c5c0cc71d0
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-11-23 12:18:29 +01: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
1003969468
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-17 11:04:40 -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
Joakim Erdfelt
Olivier Lamy
Jesse McConnell
Lachlan Roberts
Jan Bartel
WalkerWatch
olivier lamy
Stefan Schmidt
Simone Bordet
Greg Wilkins
Ben Duffield