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

12660 Commits

Author SHA1 Message Date
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
Greg Wilkins 5a91c4574a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-08 16:49:21 +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
Greg Wilkins 3fafd6ee8f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-08 16:25:29 +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 0c1c188cb7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-08 15:01:38 +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 4cd9a66a18 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-08 10:44:08 +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 fb35230d77 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-08 10:28:22 +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 dce6000929 Merge branch 'jetty-9.4.x' 2016-06-07 15:08:11 -07:00
Joakim Erdfelt 1e239e53a8 Fixing compact3 build 2016-06-07 15:07:51 -07:00
Jesse McConnell e70c586533 Merge branch 'jetty-9.4.x' 2016-06-07 15:52:23 -05:00
Jesse McConnell 4283c15fe1 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 15:52:07 -05:00
Jesse McConnell 7b0e045671 Merge pull request #621 from WalkerWatch/jetty-9.3.x 
Removed references to SPDY in Chapter 3, updated Chapter 10...
 2016-06-07 15:51:08 -05:00
Jesse McConnell 64ed45389b Issue 589 creation of jetty-home and leveraging it in jetty-distribution 2016-06-07 15:42:10 -05:00