4ba0fa9544
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-15 10:41:10 +10:00
f724d36646
Cleanup #624
...
removed excess test code
2016-06-15 10:38:40 +10:00
bc87cf0ab4
Revert "Debug #624"
...
This reverts commit b40c2ae66f
2016-06-15 10:32:10 +10:00
a565b6fa83
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-14 11:09:02 +02:00
35077c9803
Increased timeouts to avoid failures on slower machines.
2016-06-14 11:08:38 +02:00
876f20006d
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-14 11:04:54 +02: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
dfb20e6398
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-14 00:26:59 +02:00
c0f54ab82f
Increased timeouts to avoid failures on slower machines.
2016-06-14 00:26:18 +02:00
3dca610f7b
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-13 23:39:23 +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
da4a9e4cd8
Enlarged client-side idle timeout to avoid failures in slower machines.
2016-06-13 19:14:37 +02:00
831791bdf4
Merge branch 'distro-rework-589' into jetty-9.4.x
2016-06-13 11:49:39 -05:00
dd2a31e240
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-13 18:12:34 +02:00
45eac1de69
Enlarged idle timeout to avoid failures in slower machines.
2016-06-13 18:11:07 +02:00
7c0d1ea026
Refactored tests to use HttpTester instead of SimpleHttpParser.
2016-06-13 17:55:03 +02:00
2b539b6383
Fixes #638 - ConnectHandler responses should have Content-Length.
...
Added Content-Length: 0 to the responses.
2016-06-13 17:54:41 +02:00
9ca6d617a8
Merge branch 'jetty-9.4.x' into distro-rework-589
2016-06-13 10:08:22 -05:00
b9a27f792a
Updated test to print out test method via TestTracker.
2016-06-13 16:24:53 +02:00
3d8242ef82
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-13 12:16:33 +02:00
e803bf6c81
Test code cleanup.
...
Converted static fields to non-static, and removed unused code.
2016-06-13 12:15:45 +02:00
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
19e52ab9c4
Removing HttpCompliance from example
2016-06-10 13:19:51 -07:00
eef2252e14
merged
2016-06-10 10:46:58 -05:00
e93f98951b
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-10 12:18:33 +10:00
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
73a0cd6b06
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-10 11:53:45 +10:00
27ed0480b9
Issue #632
...
Remove unneeded scripts
2016-06-10 11:52:32 +10:00
1cdeac9c53
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-10 11:50:41 +10:00
a6cfff8573
Issue #632 fix jmx tests to use random jetty server port
2016-06-10 11:46:15 +10:00
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
147df2a031
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-09 14:18:27 -05:00
7e3db100ab
resolve version expansion across blocks by adding subs= attributes
2016-06-09 14:18:04 -05:00
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
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
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
6c21f0d30d
Fix #627 Use start.d or start.ini not both
...
Updated usage text
2016-06-09 16:51:26 +10:00
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
918399b69f
fixed module ordering problem
2016-06-08 18:27:28 +10:00
86e5b1cf9b
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-08 16:48:50 +10:00
d458d41632
more generous unit test timeouts
2016-06-08 16:48:19 +10:00
7314a9b86a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-08 16:25:23 +10:00
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
3a9dfd913a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-08 16:24:09 +10:00
31a23d2671
Ignore poor test case ThreadMonitorTest
2016-06-08 16:23:10 +10:00
Greg Wilkins
Simone Bordet
Jesse McConnell
Joakim Erdfelt
Jan Bartel
Robin Bygrave