Commit Graph

54 Commits

Author SHA1 Message Date
Jesse McConnell 863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Jesse McConnell 81d72052c8 merged master to jetty-8 2012-07-11 14:04:49 -05:00
Jesse McConnell aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Simone Bordet fef74963af Forgotten modifications from Jetty7 2012-03-14 19:39:21 +01:00
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
2011-11-30 16:27:30 +11:00
Greg Wilkins 55d5020980 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
Greg Wilkins b969de1788 organized imports 2011-11-28 15:32:14 +11:00
Simone Bordet c6103f2d53 Removed usages of ThreadDeath. 2011-11-24 20:39:04 +01:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Greg Wilkins 6edb7c1930 organised imports 2011-10-18 15:05:22 +11:00
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Joakim Erdfelt f15617fbb2 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of jetty-continuation, jetty-http, jetty-io
2011-08-24 12:51:39 -07:00
Greg Wilkins 17e907c2fb git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +10:00
Simone Bordet ed46fbf209 Improved Javadocs.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3026 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-20 15:41:21 +00:00
Greg Wilkins a2b1ceabc8 339084 Fixed NPE with servlet 3.0 async listener
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2962 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-04 07:02:26 +00:00
Greg Wilkins 1fd3bc1de2 318105 backed out recent changes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2826 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-23 22:07:40 +00:00
Greg Wilkins d753311181 318105 Consistent return of null from continuation.getServletResponse
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2823 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-23 05:05:38 +00:00
Greg Wilkins c0759a44f1 324260 jetty-6 continuations support complete calls
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2236 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-02 01:40:52 +00:00
Michael Gorovoy f68610a2b9 309185 even more javadoc fixes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1901 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-27 03:55:16 +00:00
Joakim Erdfelt f48076dc78 309185 - Fix the over 300 Javadoc warnings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1635 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-30 16:29:36 +00:00
Greg Wilkins 4690be611a #309185 more javadoc fixes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1628 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-30 08:53:19 +00:00
Joakim Erdfelt b7b067e7f3 309185 - Fix the over 300 Javadoc warnings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1627 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-29 23:03:36 +00:00
Joakim Erdfelt 6bc437c298 309185 - Fix the over 300 Javadoc warnings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1626 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-29 23:03:04 +00:00
Joakim Erdfelt b6aba1ceae 309185 - Fix the over 300 Javadoc warnings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1623 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-29 20:04:02 +00:00
Greg Wilkins df7af92d94 servlet 3 continuations
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1428 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-31 09:00:16 +00:00
Greg Wilkins 6985c24948 307589 updated servlet 3.0 continuations for final API
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1427 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-30 22:15:06 +00:00
Greg Wilkins a21a29b6a9 306884 handle timeouts <=0 for suspend
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1407 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-23 22:57:45 +00:00
Greg Wilkins 27aa1d806d updated servlet 3 api
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1312 7e9141cc-0065-0410-87d8-b60c137991c4
2010-02-28 11:22:01 +00:00
Greg Wilkins 5416ec325c detect no ContinuationFilter
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1103 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-27 02:43:54 +00:00
Greg Wilkins 227fb5abec numerous code cleanups
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1014 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-26 07:48:39 +00:00
Greg Wilkins 9583051709 Refactored continuation test harnessess
Continuations ISE rather than ignore bad transitions



git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@990 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-15 01:24:33 +00:00
Greg Wilkins f47ddbee95 JETTY-1101 Updated servlet3 continuation constructor
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@826 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-08 04:56:51 +00:00
Greg Wilkins a33c8cdf1a 287632 FilterContinuations for blocking jetty6
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@763 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-26 03:01:35 +00:00
Greg Wilkins 8169829ce2 fixed from sync with jetty-8
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@573 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-21 22:44:06 +00:00
Greg Wilkins 1c6a46a8b2 always throw continuation throwable
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@395 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-15 06:39:09 +00:00
Greg Wilkins 963fd5da81 279725 Support 100 and 102 expectations
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@356 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-10 02:17:34 +00:00
Greg Wilkins 575bd42a7d javadoc
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@338 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-08 07:35:06 +00:00
Greg Wilkins f385c89b00 javadoc
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@337 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-08 05:03:44 +00:00
Greg Wilkins 36a156d4cf javadoc and ContinuationThrowable
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@336 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-08 04:41:11 +00:00
Greg Wilkins c8f300bc52 continuations only support response wrapping
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@335 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-08 01:09:17 +00:00
Simone Bordet e09a8e17e0 Fixed Jetty6 continuation support discovery.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@331 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-04 11:24:46 +00:00
David Jencks ac3bd2b73f bug 279028 Java 6 compilation problem with generics
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@330 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-03 21:09:47 +00:00
Greg Wilkins 8f940927ff simplifications and fixes from porting auction to oort
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@325 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-01 05:04:37 +00:00
Greg Wilkins 0ef6db092a renamed AsyncRequest to AsyncContinuation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@308 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-28 01:30:36 +00:00
Greg Wilkins 515c800bf9 imports and formatting
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@269 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-25 01:45:02 +00:00
Greg Wilkins 2b6057b3ea improved continuation tests
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@266 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-23 14:26:37 +00:00
Greg Wilkins 8f04010f67 portable continuations
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@265 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-23 11:33:40 +00:00