509 Commits

Author SHA1 Message Date
Jan Bartel
7523c5234c Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-jsp/pom.xml
2013-04-04 13:31:33 +11:00
Greg Wilkins
fd099aa77d 404511 Replaced all StringMap usage with Tries 2013-03-28 13:20:47 +11:00
Jan Bartel
279dff381c Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-osgi/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlets/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
2013-03-18 16:00:23 +11:00
Joakim Erdfelt
897c35c2cb [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
Joakim Erdfelt
cc6196af50 [maven-release-plugin] prepare release jetty-9.0.0.v20130308 2013-03-08 11:33:15 -07:00
Joakim Erdfelt
7fc38f6c0f [maven-release-plugin] prepare for next development iteration 2013-03-07 19:14:19 -07:00
Joakim Erdfelt
96d045442f [maven-release-plugin] prepare release jetty-9.0.0.v20130307 2013-03-07 19:14:11 -07:00
Jesse McConnell
778ee1411b [maven-release-plugin] prepare for next development iteration 2013-03-06 10:21:46 -06:00
Jesse McConnell
d916078711 [maven-release-plugin] prepare release jetty-9.0.0.v20130306 2013-03-06 10:21:38 -06:00
Joakim Erdfelt
94756a42c3 [maven-release-plugin] prepare for next development iteration 2013-03-01 16:08:32 -07:00
Joakim Erdfelt
96dabe7e62 [maven-release-plugin] prepare release jetty-9.0.0.RC3 2013-03-01 16:08:24 -07:00
Joakim Erdfelt
c267c1a9d0 [maven-release-plugin] prepare for next development iteration 2013-03-01 10:26:43 -07:00
Joakim Erdfelt
ba15fe04e2 [maven-release-plugin] prepare release jetty-9.0.0.RC3 2013-03-01 10:26:34 -07:00
Joakim Erdfelt
e950957950 [maven-release-plugin] prepare for next development iteration 2013-02-24 08:13:34 -07:00
Joakim Erdfelt
459e04d3b2 [maven-release-plugin] prepare release jetty-9.0.0.RC2 2013-02-24 08:13:26 -07:00
Jesse McConnell
a6c48312f6 [maven-release-plugin] prepare for next development iteration 2013-02-22 07:53:11 -06:00
Jesse McConnell
484162de79 [maven-release-plugin] prepare release jetty-9.0.0.RC1 2013-02-22 07:52:48 -06:00
Jesse McConnell
48e9e9c36c [maven-release-plugin] prepare for next development iteration 2013-02-21 17:44:16 -06:00
Jesse McConnell
ca072f9c82 [maven-release-plugin] prepare release jetty-9.0.0.RC1 2013-02-21 17:43:59 -06:00
Jesse McConnell
85a9371c2e [maven-release-plugin] prepare for next development iteration 2013-02-21 14:37:06 -06:00
Jesse McConnell
2b5abf7ed2 [maven-release-plugin] prepare release jetty-9.0.0.RC1 2013-02-21 14:36:57 -06:00
Jesse McConnell
95eefd5381 [maven-release-plugin] prepare for next development iteration 2013-02-21 11:10:53 -06:00
Jesse McConnell
399828d833 [maven-release-plugin] prepare release jetty-9.0.0.RC1 2013-02-21 11:10:35 -06:00
Joakim Erdfelt
c6fe8ef716 [maven-release-plugin] prepare for next development iteration 2013-02-01 10:47:11 -07:00
Joakim Erdfelt
2ebdc749db [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-01 10:47:03 -07:00
Simone Bordet
209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01: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
27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Jan Bartel
8d0e776b2a Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	test-jetty-webapp/pom.xml
	tests/test-integration/pom.xml
2013-01-07 12:47:32 +11:00
Joakim Erdfelt
9fde0c56ab Merge branch 'jetty-7' into jetty-8 2012-12-27 14:22:57 -07:00
Joakim Erdfelt
2591ceb8f5 Fixing testcase 2012-12-27 09:57:20 -07:00
Jesse McConnell
863109b552 resolving merge issue 2012-12-27 13:49:31 -03:00
Jesse McConnell
525aa8b208 [Bug 397190] improve ValidUrlRule to iterate on codepoints 2012-12-27 13:26:47 -03:00
Joakim Erdfelt
6fca5fc6f9 Found valid Unicode URI that fails ValidUrlRule 2012-12-27 08:09:07 -07:00
Greg Wilkins
31def06214 jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported 2012-12-24 19:17:00 +11:00
Greg Wilkins
6f098dd69c jetty-9 use DateCache timer to set Date header once per second 2012-12-10 12:58:14 +11:00
Jan Bartel
c9db4ca815 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-proxy/pom.xml
	pom.xml
2012-11-30 15:45:36 +11:00
Greg Wilkins
b3e1114313 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	VERSION.txt
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
	jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
2012-11-30 12:04:00 +11:00
Jesse McConnell
61e5aba531 Merge branch 'jetty-7' into jetty-8 2012-11-29 11:31:27 -06:00
Jesse McConnell
a22f2a25eb tweak tests and add some commenting 2012-11-29 11:30:02 -06:00
Jesse McConnell
51bb01e14b decode the request uri and validate that 2012-11-29 11:23:16 -06:00
Jesse McConnell
a5081abc55 add license headers 2012-11-29 10:54:35 -06:00
Jesse McConnell
90b8f60e7b [Bug 395380] add ValidUrlRule to jetty-rewrite 2012-11-29 10:53:50 -06:00
Thomas Becker
dd180a8c48 394681: fix jetty-rewrite.xml to match test webapps new context /test 2012-11-20 17:09:36 +01:00
Jesse McConnell
bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell
1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell
70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell
017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00