7592 Commits

Author SHA1 Message Date
Joakim Erdfelt
6076e05bf6 JSR-356 fixing oddly worded exception 2013-07-26 14:04:17 -07:00
Joakim Erdfelt
941989e5cb Tweaking generics. 2013-07-26 14:04:17 -07:00
Joakim Erdfelt
ca23911075 JSR-356 - Changing to ServerContainer access.
+ Using technique as outlined in JSR-356 spec, Section 6.4
2013-07-26 14:04:17 -07:00
Simone Bordet
89be2de57f Merged branch 'master' into 'jetty-9.1'. 2013-07-26 19:17:30 +02:00
Simone Bordet
61ea4d6705 Fixed method parseResponse() that should never return null.
The response is "filled" by parser events even if at the end of
the parsing the parser returns false.
2013-07-26 19:07:39 +02:00
Jesse McConnell
20bd1e0f96 [maven-release-plugin] prepare for next development iteration 2013-07-26 11:50:17 -05:00
Jesse McConnell
49c3b2c32a [maven-release-plugin] prepare release jetty-8.1.12.v20130726 jetty-8.1.12.v20130726 2013-07-26 11:49:58 -05:00
Jesse McConnell
6ed360c480 reset for release 2013-07-26 11:23:57 -05:00
Jesse McConnell
8de5fbbac7 Merge branch 'release-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into release-8 2013-07-26 11:18:52 -05:00
Jesse McConnell
1a5117e9ab [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:18:24 -05:00
Jesse McConnell
650e8e93ae [maven-release-plugin] prepare for next development iteration 2013-07-26 10:57:33 -05:00
Jesse McConnell
e7e2fce56e [maven-release-plugin] prepare release jetty-7.6.12.v20130726 jetty-7.6.12.v20130726 2013-07-26 10:57:26 -05:00
Thomas Becker
e628478eb4 Replace calls to deprecated HttpTransport.send(..) method in SPDY code 2013-07-26 17:52:16 +02:00
Jesse McConnell
ed660fffd7 set for release 2013-07-26 10:51:28 -05:00
Thomas Becker
ae785f034e Replace calls to deprecated HttpTransport.send(..) method in SPDY code 2013-07-26 17:51:02 +02:00
Jesse McConnell
98249488d4 set for release 2013-07-26 10:49:24 -05:00
Jesse McConnell
869389e857 set for release 2013-07-26 10:48:53 -05:00
Thomas Becker
af82e49835 ProxySPDYToSPDYLoadTest small change for shutting down the test 2013-07-26 17:40:57 +02:00
Thomas Becker
fb04ee8fbd QueuedHttpInput fix javadoc 2013-07-26 17:38:47 +02:00
Thomas Becker
b02535698a Double dispatch warning should be logged at debug level 2013-07-26 17:38:46 +02:00
Jesse McConnell
d87a3884ad Merge branch 'jetty-8' into release-8 2013-07-26 10:38:24 -05:00
Jesse McConnell
e59f1d2191 set for release 2013-07-26 10:30:55 -05:00
Jesse McConnell
ef7ea3cbbf Merge branch 'jetty-7' into release-7 2013-07-26 10:28:27 -05:00
Jesse McConnell
7a5401e506 Merge branch 'jetty-8' 2013-07-26 10:27:43 -05:00
Jesse McConnell
5a0278fc3f Merge branch 'jetty-7' into jetty-8 2013-07-26 10:26:46 -05:00
David Harrigan
192f2d7002 BUG-413812
Mark RateTracker as Serializable to allow it to be stored in a Session that is
eventually persisted in a distributed memory platform.

Signed-off-by: David Harrigan <dharrigan@gmail.com>
2013-07-26 10:24:03 -05:00
Jesse McConnell
6622e06841 set for release 2013-07-26 09:13:52 -05:00
Jesse McConnell
e1db76563a Merge branch 'jetty-7' into release-7 2013-07-26 09:12:45 -05:00
Simone Bordet
2eb3925358 Merged branch 'master' into 'jetty-9.1'. 2013-07-26 14:18:10 +02:00
Simone Bordet
bc096cace4 Moved new JSON classes to the right module. 2013-07-26 14:17:42 +02:00
Simone Bordet
9d571af7b0 Merged branch 'master' into 'jetty-9.1'. 2013-07-26 13:55:05 +02:00
Simone Bordet
cea4ac5fe3 Merged branch 'jetty-8' into 'master'. 2013-07-26 13:51:26 +02:00
Simone Bordet
b7b3ced092 Merged branch 'jetty-7' into 'jetty-8'. 2013-07-26 13:46:08 +02:00
Simone Bordet
2be4ca5921 Reverted VERSION.txt. 2013-07-26 13:45:41 +02:00
Simone Bordet
5c7eb9e265 Reverted version to 7.6.12-SNAPSHOT. 2013-07-26 13:36:35 +02:00
Simone Bordet
a0519a9693 413371 - Default JSON.Converters for List and Set.
Introduced a JSONCollectionConvertor that is able to convert
Collections, and hence both List and Set.

Code cleanups.
2013-07-26 13:09:11 +02:00
Jan Bartel
2a2eb9cd38 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-07-26 18:02:10 +10:00
Jan Bartel
e6974dadab Harmonize with jetty-9 apis 2013-07-26 18:01:37 +10:00
Greg Wilkins
ea7854eccf removed delicate external test 2013-07-26 16:09:50 +10:00
Greg Wilkins
4a5567433c 413372 JSON Enum uses name rather than toString() 2013-07-26 16:06:32 +10:00
Greg Wilkins
7df6b6b9ac added comment header 2013-07-26 12:13:08 +10:00
Greg Wilkins
711ddbd234 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-07-26 11:59:33 +10:00
Greg Wilkins
c76de0b584 404468 Ported jetty-http-spi to Jetty-9 2013-07-26 11:40:12 +10:00
Jesse McConnell
9137644595 Merge branch 'release-7' into jetty-7 2013-07-25 15:10:09 -05:00
Jesse McConnell
e810727b55 set for dev 2013-07-25 15:09:03 -05:00
Jesse McConnell
49045558ef [maven-release-plugin] prepare for next development iteration 2013-07-25 14:07:12 -05:00
Jesse McConnell
9b888d5c22 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 14:06:53 -05:00
Joakim Erdfelt
c0f0341a03 3rd party External Proxy no longer stable 2013-07-25 11:45:21 -07:00
Jesse McConnell
de2840ca1e [maven-release-plugin] prepare for next development iteration 2013-07-25 12:52:15 -05:00
Jesse McConnell
3e94867f7f [maven-release-plugin] prepare release jetty-8.1.12.v20130725 jetty-8.1.12.v20130725 2013-07-25 12:52:07 -05:00