Commit Graph

14300 Commits

Author SHA1 Message Date
Joakim Erdfelt 95feaa6198 Fixing NPE 2017-03-10 14:05:19 -07:00
Joakim Erdfelt 92afe54c1d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-10 13:22:32 -07:00
Joakim Erdfelt e25007cb79 Issue #1390 - Addressing new File(URL) use in Windows
+ Fixing HashLoginService to track its Config via File reference only
  (dropping support for URL reference)
+ Adding new `this.web-inf.path` property that jetty-web.xml can use
2017-03-10 12:47:06 -07:00
Jan Bartel 5933f70ae6 Issue #1049
Ensure file paths for osgi config files are correct urls
2017-03-10 09:34:20 -07:00
Joakim Erdfelt c5b5e1cf65 Undoing gcloud version update from cherry-pick 2017-03-10 09:15:15 -07:00
Joakim Erdfelt cf507084fe Cherry-pick Cleanup 2017-03-10 09:04:02 -07:00
Jan Bartel 0c5548fd03 Issue #1389 2017-03-10 09:03:34 -07:00
Jan Bartel 7dc61365e4 Issue #1387
Upgraded paxexam and osgi container.
2017-03-10 09:02:40 -07:00
Jan Bartel 64a00eafd3 Issue #1389 2017-03-10 18:21:40 +11:00
Jan Bartel 20c50424a3 Issue #1387
Upgraded paxexam and osgi container.
2017-03-10 17:28:42 +11:00
Greg Wilkins 6102861755 made test have longer timeouts 2017-03-10 15:00:45 +11:00
Greg Wilkins bd6e888be4 made test have longer timeouts 2017-03-10 14:58:47 +11:00
Jan Bartel 72fe2a88c2 Issue #1049
Ensure file paths for osgi config files are correct urls
2017-03-10 11:59:20 +11:00
Greg Wilkins b747b7fb2f Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-03-10 09:31:52 +11:00
Greg Wilkins ae0c8ce2af graceful test shutdown 2017-03-10 09:25:06 +11:00
Joakim Erdfelt 01d539e2be Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-09 14:20:19 -07:00
Joakim Erdfelt 1eeac2af6b Fixing test 2017-03-09 14:17:05 -07:00
WalkerWatch c2887d0b14 Updating commit instructions.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-03-09 15:35:00 -05:00
WalkerWatch e7de3ee662 Resolves #856 and updates exisitng doco.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-03-09 11:26:59 -05:00
Joakim Erdfelt e796063ace Issue #1049 - Upgrading paxexam, downgrading surefire 2017-03-09 07:43:26 -07:00
Joakim Erdfelt 76c6377ed7 Windows Test Issue
+ Adding slf4j-simple to test scope to attempt to capture reason
  for the test setup failure:

  "org.osgi.framework.BundleException: Error while renaming bundle file
  to final location C:\"
2017-03-09 06:58:45 -07:00
Joakim Erdfelt d2e35e239a Windows Test Issue
+ Changing from @Test(expect=<exception>) to
  @Rule ExpectedException for ...
  * no exception occuring when one is expected is a test failure
  * wrong exception is a test failure
  * wrong cause is a test failure
2017-03-09 06:51:57 -07:00
Greg Wilkins 48131f1fab Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-09 23:40:51 +11:00
Greg Wilkins aacc59bb57 made test less stressful 2017-03-09 23:37:36 +11:00
Greg Wilkins aa73cff97f Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-09 20:51:41 +11:00
Greg Wilkins f6f86344f3 Fixes #1378 - Slow TLS clients may hang the server.
Reduced the stress of the test
2017-03-09 17:51:58 +11:00
Jan Bartel 0b37e8d8ec Issue #856
Modularize choice of auth connection string or server/port connection.
2017-03-09 16:51:21 +11:00
Jan Bartel 351a55f494 Merge pull request #1372 from jin-z/jetty-9.4.x
Issue #856 Add server/port and auth configuration for mongo sessions
2017-03-09 16:43:50 +11:00
Greg Wilkins 9ccf0a5337 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-09 16:39:30 +11:00
Greg Wilkins 2219863c11 Issue #1340 Consistent optional use of query string in PushCacheFilter 2017-03-09 16:24:31 +11:00
Greg Wilkins 18d87aa972 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-09 15:59:19 +11:00
Greg Wilkins 9f9e1ab190 Issue #1374 Stop on Failure 2017-03-09 15:56:54 +11:00
Greg Wilkins 9690e064bc increase test timeout 2017-03-09 15:44:27 +11:00
Jin Zhang 7f916762f5 Issue #856 Add server/port and auth configuration for mongo sessions
Signed-off-by: Jin Zhang <jin.zhang@epicgames.com>
2017-03-08 18:21:01 -08:00
Jin Zhang f3748d70ee Issue #856 Add server/port and auth configuration for mongo sessions
Signed-off-by: Jin Zhang <jin.zhang@epicgames.com>
2017-03-08 18:16:18 -08:00
Joakim Erdfelt 505595508c Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-03-08 17:47:42 -07:00
Joakim Erdfelt 6cf0663fe8 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-03-08 17:47:27 -07:00
Jan Bartel 966d80f304 Merge pull request #1385 from mintern/jetty-9.4.x
Handle spurious files in sessions directory
2017-03-09 11:47:20 +11:00
Brandon Mintern a32b8d5cc7 Handle spurious files in sessions directory
Fixes issue #1373.

Signed-off-by: Brandon Mintern <brandon@mintern.net>
2017-03-08 18:06:13 -05:00
Joakim Erdfelt 298de714f6 More windows build fixes 2017-03-08 15:29:54 -07:00
Joakim Erdfelt 0963a1c287 Fixes to windows build 2017-03-08 13:10:53 -07:00
Joakim Erdfelt 13259d2dc0 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-03-08 10:39:54 -07:00
Joakim Erdfelt 65275ec42a Fixes to windows build 2017-03-08 10:38:00 -07:00
olivier lamy d5aa619f1b Revert "fix some osgi build"
This reverts commit accf0715b3.
2017-03-08 21:28:44 +11:00
olivier lamy ed4eb43eae Revert "upgrade maven-bundle-plugin to 2.5.4"
This reverts commit 1d4bc8feea.
2017-03-08 21:27:09 +11:00
Jan Bartel 58f3855ef5 Issue #1377
Add extra test to ensure immortal session never scavenged
2017-03-08 17:22:47 +11:00
Jan Bartel 82413e1eeb Merge pull request #1377 from telomir/jetty-9.4.x
MongoSessionDataStore: fix for scavenging of local immortal sessions
2017-03-08 17:15:13 +11:00
Jan Bartel 7ceab7dd5d Issue #1379 2017-03-08 11:28:37 +11:00
Greg Wilkins 7ef9d7c18d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-08 10:05:26 +11:00
Greg Wilkins 43d0488269 Issue #1384 Expose StatisticsServlet 2017-03-08 10:04:48 +11:00