Commit Graph

12792 Commits

Author SHA1 Message Date
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
WalkerWatch ef63395b07 Removed references to SPDY in Chapter 3, updated Chapter 10 with general info on Sessions
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-07 16:40:24 -04:00
Jesse McConnell e79c4d582b Merge branch 'jetty-9.4.x' 2016-06-07 11:57:39 -05:00
Jesse McConnell 20c1301203 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 11:56:27 -05:00
Jesse McConnell 39ef0ec7d6 fix bad test target dir usage 2016-06-07 11:55:48 -05:00
Jesse McConnell 6b92b698a9 Merge pull request #618 from WalkerWatch/jetty-9.3.x
Chapter 10 clean up and link fixes.
2016-06-07 11:54:49 -05:00
Simone Bordet 473c8f0c09 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-07 10:24:15 +02:00
Simone Bordet 73fe6715de Issue #306 - Merge jetty-parent into jetty-project.
Moved more plugin version declarations into jetty.project's pom.
2016-06-07 10:23:38 +02:00
WalkerWatch 1d3816fdc5 Chapter 10 clean up and link fixes.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-06 21:20:11 -04:00
Greg Wilkins 40af755251 restructure failing test to better analyse failure 2016-06-07 10:44:33 +10:00
Simone Bordet 2d1d3fe6e9 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-06 21:39:31 +02:00
Simone Bordet a8f25b550f Fixes #487 - JDK 9 build compatibility.
Fixes #306 - Merge jetty-parent into jetty-project.

- Removed jetty.parent dependency, moving all relevant sections to
jetty.project's pom.xml.
- Introduced profiles for JDK 8 only modules and configuration, and
for JDK 9 only modules and configurations.
- Major cleanup of pom.xml files.
- All Maven Plugin now declared in alphabetical order in
pluginManagement section of jetty.project's pom.xml.
2016-06-06 21:28:51 +02:00
Joakim Erdfelt dd8afc34b9 Merge branch 'jetty-9.3.x' into bugs/388 2016-06-06 08:37:36 -07:00
Joakim Erdfelt 8758cbb607 Fixes #388 - Provide pluggable RemoteEndpoint service 2016-06-06 07:44:46 -07:00
Joakim Erdfelt 6e3d85e15e Merge branch 'feature/looptest' into jetty-9.3.x 2016-06-06 07:02:25 -07:00
Joakim Erdfelt 4ce35feb41 Adding OPTS 2016-06-06 07:01:48 -07:00
Joakim Erdfelt 40526513f4 More looptest experimentation 2016-06-03 14:27:33 -07:00
Joakim Erdfelt 5e3a534d5d More looptest experimentation 2016-06-03 14:17:28 -07:00
Simone Bordet 58f8d44ae2 Improved looptest.sh.
Fixed reference to test class.
Added DEBUG logging.
2016-06-03 23:14:18 +02:00