12683 Commits

Author SHA1 Message Date
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
df2af60710 Fixes #640 - ClientContainer should store WebSocket sessions as beans. 2016-06-13 23:23:14 +02:00
Simone Bordet
77de314ce1 Fixes #639 - ServerContainer stores WebSocket sessions twice.
ServerContainer now delegates session storage to WebSocketServerFactory.
2016-06-13 23:23:14 +02:00
Simone Bordet
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
Simone Bordet
e578c79b41 Code cleanups. 2016-06-13 23:23:14 +02:00
Simone Bordet
da4a9e4cd8 Enlarged client-side idle timeout to avoid failures in slower machines. 2016-06-13 19:14:37 +02:00
Jesse McConnell
831791bdf4 Merge branch 'distro-rework-589' into jetty-9.4.x 2016-06-13 11:49:39 -05:00
Simone Bordet
dd2a31e240 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-13 18:12:34 +02:00
Simone Bordet
45eac1de69 Enlarged idle timeout to avoid failures in slower machines. 2016-06-13 18:11:07 +02:00
Simone Bordet
7c0d1ea026 Refactored tests to use HttpTester instead of SimpleHttpParser. 2016-06-13 17:55:03 +02:00
Simone Bordet
2b539b6383 Fixes #638 - ConnectHandler responses should have Content-Length.
Added Content-Length: 0 to the responses.
2016-06-13 17:54:41 +02:00
Jesse McConnell
9ca6d617a8 Merge branch 'jetty-9.4.x' into distro-rework-589 2016-06-13 10:08:22 -05:00
Simone Bordet
b9a27f792a Updated test to print out test method via TestTracker. 2016-06-13 16:24:53 +02:00
Simone Bordet
3d8242ef82 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-13 12:16:33 +02:00
Simone Bordet
e803bf6c81 Test code cleanup.
Converted static fields to non-static, and removed unused code.
2016-06-13 12:15:45 +02:00
Greg Wilkins
b40c2ae66f Debug #624
This commit is instrumentation to be executed in the CI system to debug #624
This commit should be reverted once the test has failed again!
2016-06-11 10:33:48 +10:00
Joakim Erdfelt
19e52ab9c4 Removing HttpCompliance from example 2016-06-10 13:19:51 -07:00
Jesse McConnell
eef2252e14 merged 2016-06-10 10:46:58 -05:00
Jan Bartel
e93f98951b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-10 12:18:33 +10:00
Jan Bartel
76a5ec1b8e Merge pull request #629 from rbygrave/springboot-metaInfConf
Issue #628 resolve by checking for existing jar: prefix on uri
2016-06-10 12:17:33 +10:00
Jan Bartel
73a0cd6b06 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-10 11:53:45 +10:00
Jan Bartel
27ed0480b9 Issue #632
Remove unneeded scripts
2016-06-10 11:52:32 +10:00
Jan Bartel
1cdeac9c53 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-10 11:50:41 +10:00
Jan Bartel
a6cfff8573 Issue #632 fix jmx tests to use random jetty server port 2016-06-10 11:46:15 +10:00
Greg Wilkins
79874d80ff Fix #627 Use start.d or start.ini not both
create file in empty to ensure it is not pruned
2016-06-10 09:40:26 +10:00
Jesse McConnell
147df2a031 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-09 14:18:27 -05:00
Jesse McConnell
7e3db100ab resolve version expansion across blocks by adding subs= attributes 2016-06-09 14:18:04 -05:00
Robin Bygrave
95d6b9f39e Issue #628 resolve by checking for existing jar: prefix on uri - additional fix for scanForResources and scanForWebFragments
Signed-off-by: Robin Bygrave <robin.bygrave@gmail.com>
2016-06-09 23:03:52 +12:00
Robin Bygrave
3923b9bbf5 Issue #628 resolve by checking for existing jar: prefix on uri - format
Signed-off-by: Robin Bygrave <robin.bygrave@gmail.com>
2016-06-09 20:19:08 +12:00
Robin Bygrave
1494906b9d Issue #628 resolve by checking for existing jar: prefix on uri
Signed-off-by: Robin Bygrave <robin.bygrave@gmail.com>
2016-06-09 20:12:32 +12:00
Greg Wilkins
6c21f0d30d Fix #627 Use start.d or start.ini not both
Updated usage text
2016-06-09 16:51:26 +10:00
Greg Wilkins
383e81db38 Fix #627 Use start.d or start.ini not both
Updated start module to look for start.d and use it if it exists
Error or warning of both start.d and start.ini exist
updated jetty-distribution to use one or the other
2016-06-09 16:45:24 +10:00
Greg Wilkins
918399b69f fixed module ordering problem 2016-06-08 18:27:28 +10:00
Greg Wilkins
86e5b1cf9b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-08 16:48:50 +10:00
Greg Wilkins
d458d41632 more generous unit test timeouts 2016-06-08 16:48:19 +10:00
Jan Bartel
7314a9b86a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-08 16:25:23 +10:00
Greg Wilkins
f59e680a94 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-06-08 16:24:32 +10:00
Greg Wilkins
3a9dfd913a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-08 16:24:09 +10:00
Jan Bartel
31a23d2671 Ignore poor test case ThreadMonitorTest 2016-06-08 16:23:10 +10:00
Greg Wilkins
2609c89d22 Issue #624 Fix onCompleted race 2016-06-08 16:22:53 +10:00
Jan Bartel
d52a1701ad Add module for session data cache 2016-06-08 15:00:32 +10:00
Greg Wilkins
f4c13e5f54 Issue #623 Add gzip suffix to etags in 304 response 2016-06-08 14:33:49 +10:00
Jan Bartel
64e8d1ff5d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-08 10:42:28 +10:00
Jan Bartel
f86d72696a Issue #622 2016-06-08 10:23:36 +10:00
Jan Bartel
beb9c90892 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-06-08 09:36:11 +10:00
Jan Bartel
191bb2d307 Renaming CachingSessionDataStoreFactory 2016-06-08 09:35:48 +10:00
Greg Wilkins
c8c4677e4d Issue #620 Fixed missing call to super(pattern) 2016-06-08 08:26:26 +10:00
Joakim Erdfelt
1e239e53a8 Fixing compact3 build 2016-06-07 15:07:51 -07:00
Jesse McConnell
4283c15fe1 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 15:52:07 -05:00