Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-25 00:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,635 Commits 55 Branches 466 Tags
Commit Graph

12635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simone Bordet
55666e8605 Merge branch 'jetty-9.4.x' into 'master'. 2016-06-14 00:27:30 +02:00
Simone Bordet
dfb20e6398 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-14 00:26:59 +02:00
Simone Bordet
c0f54ab82f Increased timeouts to avoid failures on slower machines. 2016-06-14 00:26:18 +02:00
Simone Bordet
e6210e1a43 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-13 23:39:47 +02:00
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
1bccf090b5 Merge branch 'jetty-9.4.x' 2016-06-13 11:51:09 -05:00
Jesse McConnell
831791bdf4 Merge branch 'distro-rework-589' into jetty-9.4.x 2016-06-13 11:49:39 -05:00
Simone Bordet
046e2d2a80 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-13 18:13:24 +02: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
7008a96225 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-13 12:17:31 +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
29fcd50354 Issue #632 
Fix jetty version number
 2016-06-10 16:53:52 +10:00
Jan Bartel
d05865d555 Issue #482 
Fix license header
 2016-06-10 16:42:17 +10:00
Jan Bartel
3aceb21019 Issue #482 
Correct jetty xml config file from pull request #492.
 2016-06-10 16:12:47 +10:00
Jan Bartel
1664cc599d Merge pull request #492 from laeubi/issue482 
Fix #482 The CCL while parsing the xml files should be set to a combination of Jetty and Bundle-Classloader
 2016-06-10 15:53:52 +10:00
Jan Bartel
9a541f0eb2 Fix version in jetty-memcached poms 2016-06-10 12:34:55 +10:00
Jan Bartel
11b85446e7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-10 12:32:08 +10: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
36b87967c0 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-10 11:54:52 +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
fc4ebaac92 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-10 09:41:13 +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
c6172c9f2e Merge branch 'jetty-9.4.x' 2016-06-09 14:18:52 -05: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