696 Commits

Author SHA1 Message Date
Jan Bartel
7947b35134 Reset version for rerun of 9.0.5 2013-08-15 16:47:03 +10:00
Jesse McConnell
4383c9042d [maven-release-plugin] prepare for next development iteration 2013-08-13 14:20:56 -05:00
Jesse McConnell
160d34ec23 [maven-release-plugin] prepare release jetty-9.0.5.v20130813 2013-08-13 14:20:47 -05:00
Greg Wilkins
c33db24d94 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
	tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
2013-07-04 15:00:47 +10:00
Joakim Erdfelt
78b5f7df1f [maven-release-plugin] prepare for next development iteration 2013-06-25 08:29:26 -07:00
Joakim Erdfelt
5f2c937fcb [maven-release-plugin] prepare release jetty-9.0.4.v20130625 2013-06-25 08:29:18 -07:00
Joakim Erdfelt
31faf2fe20 Reverting failed release from friday 2013-06-25 07:42:45 -07:00
Greg Wilkins
068e67a8df Code cleanups for direct RequestDispatcher access 2013-06-24 13:13:03 +10:00
Greg Wilkins
b2b2ce25fc Revert "Code cleanups for direct RequestDispatcher access"
This reverts commit 1ff665f76ac38faaa8831191b6b4be89fc1b2acf.
2013-06-24 13:11:04 +10:00
Greg Wilkins
1ff665f76a Code cleanups for direct RequestDispatcher access 2013-06-24 13:00:21 +10:00
Jesse McConnell
57bfda2a08 [maven-release-plugin] prepare for next development iteration 2013-06-21 09:49:25 -05:00
Jesse McConnell
c1082ad4d4 [maven-release-plugin] prepare release jetty-9.0.4.v20130621 2013-06-21 09:49:15 -05:00
Jan Bartel
0e4fbcb1ca 410693 ServletContextHandler.setHandler does not relink handlers - check for null 2013-06-17 20:37:06 +10:00
Jan Bartel
6b9742ff86 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-06-17 16:54:47 +10:00
Jan Bartel
d47eb462e7 410693 ServletContextHandler.setHandler does not relink handlers 2013-06-17 16:53:22 +10:00
Greg Wilkins
d6d5c04273 410893 async support defaults to false for spec created servlets and filters 2013-06-17 14:47:55 +10:00
Greg Wilkins
65a7f9f279 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-06-17 14:46:10 +10:00
Jan Bartel
2ea7843d86 Merge remote-tracking branch 'origin/jetty-8' 2013-06-17 14:39:17 +10:00
Greg Wilkins
9bf7870c7c 410893 async support defaults to false for spec created servlets and filters 2013-06-17 14:21:53 +10:00
Jan Bartel
1908fff38f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-06-17 14:11:46 +10:00
Jan Bartel
59889bc149 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-06-17 13:17:14 +10:00
Jan Bartel
232eb4491a Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-06-17 13:13:59 +10:00
Jesse McConnell
eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
Jan Bartel
64d979a780 409449 Ensure servlets, filters and listeners added via dynamic registration, annotations or descriptors are cleaned on context restarts 2013-06-12 15:41:03 +10:00
Greg Wilkins
2d661f18dd 410405 Avoid NPE for requestDispatcher(../)
Test double encoded dot dot
2013-06-11 15:30:40 +10:00
Greg Wilkins
2b1e6bf0de Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
2013-06-11 15:11:23 +10:00
Greg Wilkins
9ec1378b73 fixed merge 2013-06-11 14:57:48 +10:00
Greg Wilkins
ed04753111 410405 Avoid NPE for requestDispatcher(../) 2013-06-11 14:22:54 +10:00
Greg Wilkins
06d3fbe5aa Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java
2013-06-11 14:07:00 +10:00
Jan Bartel
52994f336a 408662 In pax-web servlet services requests even if init() has not finished running 2013-06-07 15:39:20 +10:00
Simone Bordet
e65e4e168d 409842 - Suspended request completed by a request thread does not set read interest.
HttpConnection.completed() now performs the right check about the current connection.
2013-06-05 11:34:12 +02:00
Joakim Erdfelt
3db9299369 Merge branch 'jetty-7' into jetty-8 2013-06-04 11:24:44 -07:00
Joakim Erdfelt
0c4a266d60 Fixing JDK5 test error with comparison of query string 2013-06-04 09:04:12 -07:00
Greg Wilkins
7bb3a7be28 409556 Resource files not closed
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.

FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
2013-06-03 18:21:11 +10:00
Greg Wilkins
952f8442e5 408529 Etags set in 304 response
Improved default servlet setting of etags
2013-06-03 14:22:24 +10:00
Greg Wilkins
0e11c82307 fixed merge 2013-05-31 18:07:01 +10:00
Greg Wilkins
842309e656 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-05-31 18:06:34 +10:00
Greg Wilkins
3849c893e1 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-31 11:07:40 +10:00
Greg Wilkins
219be496d9 408529 Etags set in 304 response 2013-05-31 10:59:34 +10:00
Jan Bartel
af02e9b16d Update to version to 8.1.12-SNAPSHOT after last release 2013-05-30 10:52:39 +10:00
Jesse McConnell
725dc261c8 Merge branch 'release-8' into jetty-8 2013-05-22 10:44:14 -05:00
Jesse McConnell
a1a6f0e5f2 Merge branch 'release-7' into jetty-7 2013-05-22 10:39:24 -05:00
Jesse McConnell
74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
Jesse McConnell
742f6a063d [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:16:39 -05:00
Jesse McConnell
bdbd92dbc9 [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:10:07 -05:00
Jesse McConnell
0858e69cb1 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:19:34 -05:00
Jesse McConnell
d469b77663 [maven-release-plugin] prepare release jetty-8.1.11.v20130520 2013-05-20 07:19:25 -05:00
Jesse McConnell
497c2f7819 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:15:00 -05:00
Jesse McConnell
b32d0260c9 [maven-release-plugin] prepare release jetty-7.6.11.v20130520 2013-05-20 07:14:52 -05:00
Jan Bartel
9c168866ff 407931 Add toggle for failing on servlet availability 2013-05-16 10:27:04 +10:00