Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,731 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

575 Commits

Author SHA1 Message Date
Jesse McConnell da4f95f3d3 [maven-release-plugin] prepare for next development iteration 2015-03-25 09:08:27 -05:00
Jesse McConnell e92fd438fd [maven-release-plugin] prepare release jetty-9.2.11.M0 2015-03-25 09:08:21 -05:00
Jesse McConnell e3fd0056cf [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
Jesse McConnell 9d648f4000 [maven-release-plugin] prepare release jetty-9.2.10.v20150310 2015-03-10 08:00:14 -05:00
Greg Wilkins 8ec5cab568 fixed LocalClient issue with integration tests 2015-02-27 11:18:45 +11:00
Greg Wilkins 165ae8f238 Improved LocalConnector 2015-02-26 20:13:45 +11:00
Greg Wilkins af70c4bd48 protect event schedule race 2015-02-26 15:37:51 +11:00
Greg Wilkins 752973931e Improved request buffer recycling 
Added a reference count that is incremented for each content reference passed and decremented as each content is consumed.
The request buffer is only filled or recycled if the reference count is 0
 2015-02-26 13:04:50 +11:00
Greg Wilkins 2d096b677f removed ALPN from test 2015-02-25 18:23:54 +11:00
Greg Wilkins 551b339f67 Added a HttpInput integration test 2015-02-25 16:20:00 +11:00
Greg Wilkins 9b40f6e0dd Added a HttpInput integration test 2015-02-25 15:35:51 +11:00
Greg Wilkins 0ee278902d Added a HttpInput integration test 2015-02-25 15:26:51 +11:00
Jesse McConnell 1659d83978 [maven-release-plugin] prepare for next development iteration 2015-02-24 10:38:33 -06:00
Jesse McConnell dc0c3f4c52 [maven-release-plugin] prepare release jetty-9.2.9.v20150224 2015-02-24 10:38:28 -06:00
Joakim Erdfelt 4b6d024c85 Using webdefault.xml from jetty-distribution in test cases 2015-02-18 12:39:06 -07:00
Jan Bartel d85662bd6e 459681 Remove Glassfish JSP in favor of Apache JSP 2015-02-18 19:25:20 +11:00
Jesse McConnell ce5db2ca55 [maven-release-plugin] prepare for next development iteration 2015-02-17 16:02:22 -06:00
Jesse McConnell 26b7597928 [maven-release-plugin] prepare release jetty-9.2.8.v20150217 2015-02-17 16:02:16 -06:00
Jesse McConnell aa22842c20 [maven-release-plugin] prepare for next development iteration 2015-01-16 17:48:29 -06:00
Jesse McConnell 8c58a9abc4 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 17:48:23 -06:00
Jesse McConnell 81bb8411d1 [maven-release-plugin] prepare for next development iteration 2015-01-16 12:06:36 -06:00
Jesse McConnell 7865f88b81 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 12:06:30 -06:00
Jesse McConnell db991355a2 [maven-release-plugin] prepare for next development iteration 2015-01-16 10:41:45 -06:00
Jesse McConnell 6930abb8d3 [maven-release-plugin] prepare release jetty-9.2.7.v20140116 2015-01-16 10:41:39 -06:00
Jesse McConnell 9225b124a4 [maven-release-plugin] prepare for next development iteration 2015-01-16 08:21:35 -06:00
Jesse McConnell ebd563e64d [maven-release-plugin] prepare release 9.2.7.v20140116 2015-01-16 08:21:29 -06:00
Joakim Erdfelt a3201a3c81 Happy New Year 2015 2015-01-07 17:06:59 -07:00
Joakim Erdfelt 6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Jan Bartel bc22ba72dc [maven-release-plugin] prepare for next development iteration 2014-12-05 16:45:12 +01:00
Jan Bartel 1cc075cf98 [maven-release-plugin] prepare release jetty-9.2.6.v20141205 2014-12-05 16:45:01 +01:00
Jesse McConnell 127b48c932 [maven-release-plugin] prepare for next development iteration 2014-12-03 09:00:57 -06:00
Jesse McConnell 028f4b9610 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 09:00:46 -06:00
Jesse McConnell 1263d1f3c8 [maven-release-plugin] prepare for next development iteration 2014-12-03 08:26:47 -06:00
Jesse McConnell 5c7f706496 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 08:26:35 -06:00
Jesse McConnell 09846e324d [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
Jesse McConnell 97d2bd95a6 [maven-release-plugin] prepare release jetty-9.2.5.v20141112 2014-11-12 17:13:14 -06:00
Jesse McConnell 5d0595cabd [maven-release-plugin] prepare for next development iteration 2014-11-03 13:46:58 -06:00
Jesse McConnell 772ff0bfd4 [maven-release-plugin] prepare release jetty-9.2.4.v20141103 2014-11-03 13:46:52 -06:00
Jesse McConnell 1c4a08b35b [maven-release-plugin] prepare for next development iteration 2014-10-31 09:58:16 -05:00
Jesse McConnell a4ff7bf841 [maven-release-plugin] prepare release jetty-9.2.4.v20141031 2014-10-31 09:58:10 -05:00
Jesse McConnell e1b73a64eb [maven-release-plugin] prepare for next development iteration 2014-10-30 11:28:41 -05:00
Jesse McConnell 5770cc1179 [maven-release-plugin] prepare release jetty-9.2.4.v20141030 2014-10-30 11:28:35 -05:00
Joakim Erdfelt b314bfcc94 446944 - ServletTester and HttpTester should be in <classifier>tests</classifier> 
Moving HttpTester to "tests" scoped jetty-http artifact.

 + HttpTester, a testing class, was used by jetty-servlets,
   embedded-jetty-examples, and test-integration, all from
   those testing scopes.  Moved the HttpTester into the
   pre-existing jetty-http "tests" classified artifact.

Moving ServletTester to "tests" scoped jetty-servlet artifact.

 + ServletTester, a testing class, was used by jetty-servlets,
   test-integration, and test-jetty-webapp.  This move puts
   this class in the pre-existing jetty-servlet "tests" classified
   artifact.
 2014-10-29 09:50:32 -07:00
Joakim Erdfelt 8a72a153a1 Merge branch 'jetty-9.2.x' 2014-10-28 12:32:55 -07:00
Jesse McConnell 58eb6740ec [maven-release-plugin] prepare for next development iteration 2014-10-28 14:20:30 -05:00
Jesse McConnell 19a44846cf [maven-release-plugin] prepare release jetty-9.2.4.v20141028 2014-10-28 14:20:24 -05:00
Joakim Erdfelt 264e0bce39 Revert "Moving HttpTester to "tests" scoped jetty-http artifact." 
This reverts commit 8d85940077.
 2014-10-28 07:50:56 -07:00
Simone Bordet 7cdcd69f44 Reverted version to 9.2.4-SNAPSHOT. 2014-10-28 11:52:00 +01:00
Jesse McConnell 3b745f06df [maven-release-plugin] prepare for next development iteration 2014-10-27 16:16:24 -05:00
Jesse McConnell 4f0d78c91b [maven-release-plugin] prepare release jetty-9.2.4.v20141027 2014-10-27 16:16:18 -05:00
Greg Wilkins 738c47bc55 447515 Remove GzipFilter 
Moved all usages of GzipFilter to GzipHandler
added support to ServerContextHandler to create a GzipHandler
 2014-10-24 08:17:05 +11:00
Simone Bordet e7d830c26e Merged branch 'jetty-9.2.x' into 'master'. 2014-10-13 16:57:52 +02:00
Joakim Erdfelt 8d85940077 Moving HttpTester to "tests" scoped jetty-http artifact. 
+ HttpTester, a testing class, was used by jetty-servlets,
   embedded-jetty-examples, and test-integration, all from
   those testing scopes.  Moved the HttpTester into the
   pre-existing jetty-http "tests" classified artifact.
 2014-10-13 07:35:12 -07:00
Joakim Erdfelt 9249ebb6ef Using 9.2.4-SNAPSHOT for branch 2014-09-11 06:10:44 -07:00
Jesse McConnell 9bfeb2221f [maven-release-plugin] prepare release jetty-9.2.3.v20140905 2014-09-05 09:19:23 -05:00
Jesse McConnell c034544ab9 reset for release 2014-09-05 08:10:15 -05:00
Jesse McConnell c23e5f4889 [maven-release-plugin] prepare for next development iteration 2014-08-21 09:13:38 -05:00
Jesse McConnell 3347e11281 [maven-release-plugin] prepare release jetty-9.2.3.v20140821 2014-08-21 09:13:32 -05:00
Greg Wilkins b47f9ef605 cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00
Greg Wilkins bec34b460f optimised HttpFields 2014-08-05 17:26:27 +10:00
Greg Wilkins 22e57ef7b7 refactored Request to use new HttpURI 2014-07-25 15:03:51 +10:00
Joakim Erdfelt cb42ef2167 [maven-release-plugin] prepare for next development iteration 2014-07-23 11:18:01 -07:00
Joakim Erdfelt dc62cb5ac7 [maven-release-plugin] prepare release jetty-9.2.2.v20140723 2014-07-23 11:17:55 -07:00
Greg Wilkins fa3d7d0f7e Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
 2014-07-23 16:53:13 +10:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Simone Bordet 334db9fe72 Updated version to 9.3.0-SNAPSHOT. 2014-06-16 21:33:03 +02:00
Jesse McConnell c3ee0711ca [maven-release-plugin] prepare for next development iteration 2014-06-09 13:37:54 -05:00
Jesse McConnell 06b494eeac [maven-release-plugin] prepare release jetty-9.2.1.v20140609 2014-06-09 13:37:49 -05:00
Greg Wilkins 8f4aeeeb8d updated version to 10.0.0-SNAPSHOT 2014-06-04 15:08:54 +02:00
Jesse McConnell 2e859e4ae2 [maven-release-plugin] prepare for next development iteration 2014-05-26 12:04:15 -05:00
Jesse McConnell 71ad2114c5 [maven-release-plugin] prepare release jetty-9.2.0.v20140526 2014-05-26 12:04:08 -05:00
Jesse McConnell d59dbe936b [maven-release-plugin] prepare for next development iteration 2014-05-23 09:59:19 -05:00
Jesse McConnell edc7646a4c [maven-release-plugin] prepare release jetty-9.2.0.v20140523 2014-05-23 09:59:13 -05:00
Jesse McConnell 6a3cab2a2f [maven-release-plugin] prepare for next development iteration 2014-05-15 14:44:37 -05:00
Jesse McConnell eec01cbff4 [maven-release-plugin] prepare release jetty-9.2.0.RC0 2014-05-15 14:44:28 -05:00
Jesse McConnell 4d2fdee7fc [maven-release-plugin] prepare for next development iteration 2014-05-08 11:44:34 -05:00
Jesse McConnell 4515fe661b [maven-release-plugin] prepare release jetty-9.2.0.M1 2014-05-08 11:44:27 -05:00
Simone Bordet 6fc645514e Fixed tests that broke due to changes in handling of white spaces 
between HTTP messages introduced by commit
95c6bad654.
 2014-05-03 10:29:20 +02:00
Greg Wilkins c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00
Greg Wilkins 84fa579ec7 429616 Use UTF-8 encoding for XML 2014-03-10 15:23:08 +11:00
Jesse McConnell 0ec0d452e9 [maven-release-plugin] prepare for next development iteration 2014-03-07 09:10:08 -06:00
Jesse McConnell 1e555567a9 [maven-release-plugin] prepare release jetty-9.1.3.v20140225 2014-03-07 09:10:08 -06:00
Jesse McConnell eb0aea46ce set versions.txt file to new version and fix mistaken developmentVersion 2014-02-10 13:48:29 -06:00
Jesse McConnell f3d38dfb15 [maven-release-plugin] prepare for next development iteration 2014-02-10 11:17:14 -06:00
Jesse McConnell 8f6cbc9111 [maven-release-plugin] prepare release jetty-9.1.2.v20140210 2014-02-10 11:17:07 -06:00
Jesse McConnell b82ec6e668 [maven-release-plugin] prepare for next development iteration 2014-01-08 16:47:09 -06:00
Jesse McConnell b99623a21d [maven-release-plugin] prepare release jetty-9.1.1.v20140108 2014-01-08 16:47:01 -06:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Greg Wilkins f1fc661a2c reenabled integration and RFC2616 tests 2013-11-29 17:33:05 +11:00
Mikhail Mazursky 6b0269a16d [Bug 420930] Use Charset to specify character encoding 
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
 2013-11-02 14:44:36 +06:00
Joakim Erdfelt e2d872fcc7 Merge branch 'jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	pom.xml
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
 2013-08-05 08:47:24 -07:00
Joakim Erdfelt 01786aa0c2 Merge branch 'jetty-7' into jetty-8 2013-08-02 15:11:05 -07:00
Joakim Erdfelt 79ac8ad22d Fixing License Header to conform with standard with rest of project 2013-08-02 14:34:03 -07:00
Joakim Erdfelt 2057c4c17b Upgrading Junit + Hamcrest 2013-08-02 14:25:53 -07: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 2013-07-26 11:49:58 -05:00
Jesse McConnell 6ed360c480 reset for release 2013-07-26 11:23:57 -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 2013-07-26 10:57:26 -05:00
Simone Bordet 5c7eb9e265 Reverted version to 7.6.12-SNAPSHOT. 2013-07-26 13:36:35 +02:00
Jan Bartel e6974dadab Harmonize with jetty-9 apis 2013-07-26 18:01:37 +10: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
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 2013-07-25 12:52:07 -05:00
Jesse McConnell bc679809f8 [maven-release-plugin] prepare for next development iteration 2013-07-25 11:25:58 -05:00
Jesse McConnell 39ec9b8051 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 11:25:51 -05:00
Jesse McConnell e0ad2c4ee1 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:52:39 -05:00
Jesse McConnell 99712058ca [maven-release-plugin] prepare release jetty-8.1.11.v20130725 2013-07-25 07:52:32 -05:00
Jesse McConnell 767dbe6778 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:48:09 -05:00
Jesse McConnell cfa6076c4f [maven-release-plugin] prepare release jetty-7.6.11.v20130725 2013-07-25 07:48:02 -05:00
Jan Bartel 50a67eac6a Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
	jetty-client/src/test/java/org/eclipse/jetty/client/IdleTimeoutTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
 2013-07-25 13:22:14 +10:00
Jan Bartel 72b077921d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-07-25 11:26:35 +10:00
Joakim Erdfelt ab7268e516 413684 - Trailing slash shows JSP source 
+ Adding testcase to replicate issue.
 2013-07-24 16:43:02 -07:00
Jesse McConnell eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05: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 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
Jesse McConnell acb5919844 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:10:50 -05:00
Jesse McConnell d6ebdc0a4a [maven-release-plugin] prepare release jetty-7.6.10.v20130312 2013-03-12 09:10:42 -05:00
Jesse McConnell 0405c8ded6 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:05:25 -05:00
Jesse McConnell 852178cd01 [maven-release-plugin] prepare release jetty-8.1.10.v20130312 2013-03-12 09:05:14 -05:00
Jan Bartel 246088c2ee Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
	jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/JettyOSGiBootContextAsService.java
	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWebAppAsService.java
	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWithJsp.java
 2013-02-14 20:08:37 +11:00
Joakim Erdfelt a9f6f30242 Merge branch 'jetty-7' into jetty-8 2013-02-05 18:08:15 -07:00
Joakim Erdfelt 65c2112964 Making Jsp tests work on JDK's less than 7 2013-02-05 18:00:58 -07:00
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Jesse McConnell 5c58878c3c [maven-release-plugin] prepare for next development iteration 2013-01-31 11:34:38 -06:00
Jesse McConnell ebbe37294f [maven-release-plugin] prepare release jetty-8.1.9.v20130131 2013-01-31 11:34:30 -06:00
Jesse McConnell a5e1e04af1 [maven-release-plugin] prepare for next development iteration 2013-01-31 08:42:20 -06:00
Jesse McConnell b7fb18fd65 [maven-release-plugin] prepare release jetty-7.6.9.v20130131 2013-01-31 08:42:12 -06:00
Greg Wilkins 46e13b305b Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
 2013-01-17 11:00:20 +11:00
Greg Wilkins 9cf08249e0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-17 09:16:40 +11:00
Greg Wilkins c4e77feefa unit test uses fake JSP 2013-01-15 15:53:54 +11:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
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
Greg Wilkins 3efcc2af41 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
 2013-01-10 16:24:41 +11:00
Greg Wilkins e4d51d5c16 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-10 13:25:51 +11:00
Greg Wilkins 1add18a57b 397535 Support pluggable alias checking to support symbolic links 2013-01-10 13:23:11 +11:00
Greg Wilkins 08afd17b88 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithoutAliasesTest.java
 2013-01-10 13:04:30 +11:00
Greg Wilkins 8deb1222db Making change to reintroduce this test to merged 8 2013-01-10 13:03:27 +11:00
Greg Wilkins 8232a87411 temporarly remove test 2013-01-10 12:52:21 +11:00
Greg Wilkins 74edf1867c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithoutAliasesTest.java
 2013-01-10 12:06:55 +11:00