Commit Graph

5597 Commits

Author SHA1 Message Date
Greg Wilkins 11fb3fa91e Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2012-10-19 07:43:00 +11:00
Jesse McConnell 1271143ad9 wire maven plugins back in 2012-10-18 11:16:15 -05:00
Jesse McConnell a1fa7d4fdd update maven plugins tools api dependencies to something that will clear CQ 2012-10-18 11:15:29 -05:00
Jesse McConnell 6c2fb983a9 fix modules 2012-10-18 10:56:38 -05:00
Jesse McConnell 00bceee734 last commit didn't pick it up? 2012-10-18 09:24:57 -05:00
Jesse McConnell 0bad6b5d17 just fix a messed up git mv 2012-10-18 09:21:42 -05:00
Jesse McConnell 3d1e91f43d move exmaple to examples 2012-10-18 09:18:35 -05:00
Greg Wilkins b618ce59e3 392304 fixed intermittent client SSL failure. Correctly compact in flip2fill 2012-10-18 19:55:57 +11:00
Greg Wilkins 1a895bbd44 392237 move verbose client test failures 2012-10-18 16:53:19 +11:00
Jan Bartel 0ad8913034 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-18 16:43:03 +11:00
Greg Wilkins 7796a49020 392237 cleaned up client test exceptions 2012-10-18 16:36:21 +11:00
Jan Bartel 4769ada666 392239 Allow no error-code or exception for error-pages 2012-10-18 16:34:15 +11:00
Greg Wilkins 27e8efec94 jetty-9 optimised the selector change submission 2012-10-18 15:34:10 +11:00
Greg Wilkins 7a95722d66 392237 cleaned pom 2012-10-18 14:49:22 +11:00
Jan Bartel f6c1ade82f Refactor AbstractSession to remove _jdbcAttributes 2012-10-18 14:40:22 +11:00
Greg Wilkins 23105d608a 392237 renamed license file 2012-10-18 14:33:23 +11:00
Greg Wilkins dd6c20e378 392237 moved examples to common folder 2012-10-18 14:29:55 +11:00
Greg Wilkins 9bea77d46d 392237 removed jetty-nested from jetty-9 2012-10-18 14:09:18 +11:00
Greg Wilkins 14ce734dbd jetty-9 commit test 2012-10-18 11:57:39 +11:00
Jan Bartel bf1966ca94 392239 Throw exception if no code or exception in error-page element 2012-10-18 11:30:48 +11:00
Greg Wilkins f3912f5ecc jetty-9 updated README 2012-10-18 10:20:22 +11:00
Greg Wilkins 3146a83372 Merge remote-tracking branch 'origin/jetty-8' 2012-10-18 09:57:53 +11:00
Greg Wilkins 45be2da7db Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-10-18 09:47:03 +11:00
Jesse McConnell 376303d02c remove jetty templates to admin project 2012-10-17 17:43:54 -05:00
Jesse McConnell 7a676b1c85 remove jetty-policy from jetty9 2012-10-17 17:37:41 -05:00
Jesse McConnell a6f564e8da add combo license file 2012-10-17 17:37:20 -05:00
Jesse McConnell a046ff085a remove jetty-policy from jetty9 2012-10-17 17:36:53 -05:00
Greg Wilkins 9e2b75314e jetty-9 syntax sugar 2012-10-18 08:19:13 +11:00
Thomas Becker 62e0c49841 add jetty-logging.properties for example-jetty-embedded 2012-10-17 15:02:06 +02:00
Thomas Becker dd651b0d9f Expose more stuff via jmx like threadpool details, connector details, etc.
Enhance start.ini documentation for spdy.
2012-10-17 13:37:34 +02:00
Thomas Becker 57492fe3ce fix typo in start.ini 2012-10-17 13:37:34 +02:00
Greg Wilkins d15f2077a0 jetty-9 enable JSP by default 2012-10-17 22:01:57 +11:00
Greg Wilkins 8c5ad05eb8 jetty-9 removed the contexts-available directory 2012-10-17 19:53:40 +11:00
Joakim Erdfelt c388d0e586 VERSION.txt cleanup + issue refresh of 9.0.0.M1 2012-10-16 12:19:22 -07:00
Thomas Becker f569b4b542 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-10-16 14:39:53 +02:00
Thomas Becker 8e30750a7b jetty-9 jetty.xml should be the first config file loaded by start.ini. Move jetty-logging.xml behind jetty.xml in start.ini. 2012-10-16 14:39:25 +02:00
Simone Bordet 444d5845ec jetty-9: improved logging. 2012-10-16 13:50:24 +02:00
Simone Bordet 84a1cff26e jetty-9: changed the way changes are run.
Before: changes were submitted, but if this happened in the selector thread, then they were executed immediately.
This lead to recursion: the run of a change submitted another change, which was run, which submitted a change, etc.
To avoid StackOverFlowException, a ForkInvoker was used, breaking the stack after 4 recursive calls.
The reason for this was to avoid to queue a change that could have been run in place, but costs probably it costs
more than what it saves.

Current: changes are now always queued. This avoids recursion and the need for a ForkInvoker, making the code simpler.
Instead of recursing we now iterate over the queue of changes.
2012-10-16 13:50:24 +02:00
Hugues Malphettes 8253a31614 Re-enabling the SPDy test. Hopefully someone will point what was wrong 2012-10-16 11:48:54 +08:00
Jesse McConnell cd8f940bab set for dev 2012-10-15 15:08:27 -05:00
Jesse McConnell 90c1575b75 Merge branch 'release-9' 2012-10-15 14:41:05 -05:00
Jesse McConnell 64ec72e1d5 [maven-release-plugin] prepare for next development iteration 2012-10-15 13:10:04 -05:00
Jesse McConnell 8e6d049dd8 [maven-release-plugin] prepare release jetty-9.0.0.M1 2012-10-15 13:09:56 -05:00
Jesse McConnell 82316d886d Updating VERSION.txt top section 2012-10-15 12:36:44 -05:00
Jesse McConnell 4d86e5762e Merge branch 'jetty-9' into release-9 2012-10-15 12:35:25 -05:00
Jesse McConnell f22eedf6b8 comment out spdy osgi tests for m1 release 2012-10-15 11:18:10 -05:00
Joakim Erdfelt 57abd6fded Per hybi list, adding no-cache to outgoing client request to prevent bad
intermediaries from attempting to cache the upgrade response.
2012-10-15 07:18:35 -07:00
Joakim Erdfelt a4050aa40f Removing embarrassing code 2012-10-15 06:53:08 -07:00
Greg Wilkins f5d3fec4f8 jetty-9 removed context deployer and merged context and webapps directory 2012-10-15 22:05:33 +11:00
Jan Bartel 3920146bf0 Remove printlns 2012-10-15 16:06:07 +11:00