3524 Commits

Author SHA1 Message Date
Jesse McConnell
b455b7d94e [maven-release-plugin] prepare release jetty-7.6.0.v20120125 jetty-7.6.0.v20120125 2012-01-25 09:30:55 -06:00
Jesse McConnell
3854701f85 Updating VERSION.txt top section 2012-01-25 09:08:12 -06:00
Jesse McConnell
b30ca0b99e Merge branch 'master' into release 2012-01-25 08:58:57 -06:00
Simone Bordet
f0a064b624 Fixed compilation problem. 2012-01-25 15:18:50 +01:00
Simone Bordet
46b4888c71 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-25 14:50:44 +01:00
Greg Wilkins
ee9e195b49 369602: ignore NotUtf8Exception for decodeToUtf8 2012-01-25 15:40:24 +11:00
Simone Bordet
caa325c3ba Better check for WebSocket upgrades, since Connection headers may be of the form
Connection: keep-alive, Upgrade.
2012-01-24 21:21:43 +01:00
Joakim Erdfelt
5d9e08c098 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-24 10:34:42 -07:00
Greg Wilkins
f3735fab7b 368992 avoid update key while flushing during a write 2012-01-24 18:27:59 +11:00
Joakim Erdfelt
151ae1954a Final sweep of the orbit deps in jetty-distribution 2012-01-23 09:12:48 -07:00
Greg Wilkins
067e3f17cb avoid NPE with jdk 7u4ea8 changed behaviour of SslContext init 2012-01-23 16:58:29 +11:00
Greg Wilkins
ae5ddb2930 369216 turned off the shared resource cache 2012-01-23 14:31:25 +11:00
Greg Wilkins
bc5ac3622a 369349 replace quotes with a space escape method 2012-01-23 13:13:28 +11:00
Greg Wilkins
5c08b06622 improved test 2012-01-23 10:19:08 +11:00
Joakim Erdfelt
1ae3a6bcff Conversion of old /home/joakim/.m2/eclipse-orbit to using central repo's org.eclipse.jetty.orbit deps 2012-01-20 14:59:33 -07:00
Joakim Erdfelt
e9287677f0 Making paxexam a property in prep for upgrade 2012-01-20 14:17:51 -07:00
Jesse McConnell
597f606d89 Merge branch 'release-8' into jetty-8 2012-01-20 13:51:50 -06:00
Jesse McConnell
bdabfe5dc5 reset version for dev 2012-01-20 13:51:34 -06:00
Jesse McConnell
ec731e691d [maven-release-plugin] prepare for next development iteration 2012-01-20 12:28:31 -06:00
Jesse McConnell
6004fd4553 [maven-release-plugin] prepare release jetty-8.1.0.RC5 jetty-8.1.0.RC5 2012-01-20 12:28:24 -06:00
Joakim Erdfelt
3df95d45c2 Making --dry-run work with paths that have spaces 2012-01-20 11:27:38 -07:00
Joakim Erdfelt
6fc530f7c0 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-20 11:12:42 -07:00
Joakim Erdfelt
3f172067c4 Fixing tests so that when run on a CI within jetty itself, 2012-01-20 11:12:26 -07:00
Jesse McConnell
240fd1bf14 set for release 2012-01-20 11:43:31 -06:00
Jesse McConnell
b794ad4633 Merge branch 'jetty-8' into release-8 2012-01-20 11:42:41 -06:00
Jesse McConnell
8f9722bf4a Merge branch 'master' into jetty-8 2012-01-20 11:42:18 -06:00
Jesse McConnell
9c205c3278 Merge branch 'release' 2012-01-20 11:36:25 -06:00
Jesse McConnell
c2d33f8f69 set for dev 2012-01-20 11:34:23 -06:00
Joakim Erdfelt
80ffe47e7e Tweaking test assertion for variety of values seen in various JVMs (with comments) 2012-01-20 10:32:03 -07:00
Jesse McConnell
16833ca8c9 [maven-release-plugin] prepare for next development iteration 2012-01-20 10:50:24 -06:00
Jesse McConnell
dd80d7e868 [maven-release-plugin] prepare release jetty-7.6.0.RC5 jetty-7.6.0.RC5 2012-01-20 10:50:14 -06:00
Jesse McConnell
1c467b1e6c Merge branch 'master' into release 2012-01-20 10:03:52 -06:00
Simone Bordet
45bede6fda 368992 - NPE in HttpGenerator.prepareBuffers() test case. 2012-01-20 16:57:42 +01:00
Jesse McConnell
1e3273d20c set for release 2012-01-20 08:42:24 -06:00
Jesse McConnell
5fbe21dbee Merge branch 'master' into release 2012-01-20 08:41:12 -06:00
Jesse McConnell
f8004b9160 Merge branch 'release' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into release 2012-01-20 08:40:06 -06:00
Thomas Becker
de16f76725 369048: one more test
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-01-20 13:38:42 +11:00
Thomas Becker
a594734241 369048: more test cases for ConstraintSecurityHandler
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-01-20 13:38:24 +11:00
Greg Wilkins
e1b12a633b Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-distribution/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
2012-01-20 13:00:32 +11:00
Greg Wilkins
02d53f9612 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-20 12:40:58 +11:00
Greg Wilkins
8e69edaf9e 368992 avoid non-blocking flush when writing to avoid setting !_writable without _writeblocked 2012-01-20 12:40:34 +11:00
Jan Bartel
cdba99aee5 359329 Prevent reinvocation of LoginModule.login with jaspi for already authed user 2012-01-20 08:01:35 +11:00
Jesse McConnell
4fe85c9c1e additional more informative test error messages 2012-01-19 13:42:07 -06:00
Jesse McConnell
8e262aca04 [369120] more descriptive test failure output 2012-01-19 11:26:17 -06:00
Greg Wilkins
50e551de64 368992: improved logging 2012-01-19 23:11:27 +11:00
Greg Wilkins
5cd9dbc6d3 removed unneeded imports 2012-01-19 23:08:54 +11:00
Greg Wilkins
7cd887d48b Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-19 12:40:07 +11:00
Greg Wilkins
f79bdfaf2e 368992 clear interest ops for double dispatch even if no read/write blocked threads 2012-01-19 12:39:45 +11:00
Jesse McConnell
ec7eb3348a Revert "Get rid of javax.activation."
this was not appropriate for jetty7 which needs to support java 1.5 which is not universally bundling javax.activation as previously understood.  The original commit should stand for jetty 8 though which will be handled during that merge

This reverts commit fae4f3fda93cbe2b0fe6dec42c1dec54a491c69a.
2012-01-18 15:16:34 -06:00
Jesse McConnell
dba80219b1 [368593] javax.activation is _not_ present in 1.5.0_18 2012-01-18 08:29:43 -06:00