Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,748 Commits 68 Branches 465 Tags 359 MiB
Commit Graph

12748 Commits

Author SHA1 Message Date
Jan Bartel 7f58701b53 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-06-15 13:14:39 +10:00
Jan Bartel 297918f719 Issue #641 
Use Mongo createIndex instead of deprecated ensureIndex.
 2016-06-15 13:12:37 +10:00
Greg Wilkins 51e8ba387d Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-15 10:41:40 +10:00
Greg Wilkins 4ba0fa9544 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-15 10:41:10 +10:00
Greg Wilkins f724d36646 Cleanup #624 
removed excess test code
 2016-06-15 10:38:40 +10:00
Greg Wilkins bc87cf0ab4 Revert "Debug #624" 
This reverts commit b40c2ae66f.
 2016-06-15 10:32:10 +10:00
Simone Bordet 7206579c05 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-14 11:09:30 +02:00
Simone Bordet a565b6fa83 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-14 11:09:02 +02:00
Simone Bordet 35077c9803 Increased timeouts to avoid failures on slower machines. 2016-06-14 11:08:38 +02:00
Simone Bordet 93b6dddae1 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-14 11:05:33 +02:00
Simone Bordet 876f20006d Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-14 11:04:54 +02:00
Simone Bordet dc7bd636d0 Increased timeouts to avoid failures on slower machines. 2016-06-14 11:04:18 +02:00
Simone Bordet fb76491ea0 Code cleanups. 2016-06-14 11:04:01 +02:00
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