1006 Commits

Author	SHA1	Message	Date
Jan Bartel	5094dc059d	Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: VERSION.txt example-jetty-embedded/pom.xml jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-all/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-plus/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-ajp/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nested/pom.xml jetty-nosql/pom.xml jetty-osgi/jetty-osgi-boot-jsp/pom.xml jetty-osgi/jetty-osgi-boot-logback/pom.xml jetty-osgi/jetty-osgi-boot-warurl/pom.xml jetty-osgi/jetty-osgi-boot/pom.xml jetty-osgi/jetty-osgi-equinoxtools/pom.xml jetty-osgi/jetty-osgi-httpservice/pom.xml jetty-osgi/pom.xml jetty-osgi/test-jetty-osgi-context/pom.xml jetty-osgi/test-jetty-osgi-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-rewrite/pom.xml jetty-security/pom.xml jetty-server/pom.xml jetty-servlet/pom.xml jetty-servlets/pom.xml jetty-spdy/pom.xml jetty-spdy/spdy-core/pom.xml jetty-spdy/spdy-jetty-http-webapp/pom.xml jetty-spdy/spdy-jetty-http/pom.xml jetty-spdy/spdy-jetty/pom.xml jetty-start/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml test-jetty-webapp/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/pom.xml tests/test-sessions/pom.xml tests/test-sessions/test-hash-sessions/pom.xml tests/test-sessions/test-jdbc-sessions/pom.xml tests/test-sessions/test-mongodb-sessions/pom.xml tests/test-sessions/test-sessions-common/pom.xml tests/test-webapps/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2013-08-01 12:40:23 +10:00
Jesse McConnell	2380d748f8	set for dev	2013-07-31 12:12:38 -05:00
Jesse McConnell	9db05ac2fa	set for dev	2013-07-31 12:09:17 -05:00
Jesse McConnell	ed660fffd7	set for release	2013-07-26 10:51:28 -05:00
Jesse McConnell	869389e857	set for release	2013-07-26 10:48:53 -05:00
Jesse McConnell	e59f1d2191	set for release	2013-07-26 10:30:55 -05:00
Jesse McConnell	6622e06841	set for release	2013-07-26 09:13:52 -05:00
Simone Bordet	2be4ca5921	Reverted VERSION.txt.	2013-07-26 13:45:41 +02:00
Jesse McConnell	e810727b55	set for dev	2013-07-25 15:09:03 -05:00
Jesse McConnell	a097e9ff3e	set for release	2013-07-25 11:04:03 -05:00
Jesse McConnell	3c9bcd3ece	set for release	2013-07-25 10:59:36 -05:00
Jesse McConnell	c805b15b3e	set for release	2013-07-25 07:17:10 -05:00
Jesse McConnell	7fce5e3950	set for release	2013-07-25 07:16:58 -05:00
Greg Wilkins	6ef865b153	Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: VERSION.txt example-jetty-embedded/pom.xml jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-all/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-plus/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-ajp/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nested/pom.xml jetty-nosql/pom.xml jetty-osgi/jetty-osgi-boot-jsp/pom.xml jetty-osgi/jetty-osgi-boot-warurl/pom.xml jetty-osgi/jetty-osgi-boot/pom.xml jetty-osgi/jetty-osgi-httpservice/pom.xml jetty-osgi/pom.xml jetty-osgi/test-jetty-osgi-context/pom.xml jetty-osgi/test-jetty-osgi-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-rewrite/pom.xml jetty-security/pom.xml jetty-server/pom.xml jetty-servlet/pom.xml jetty-servlets/pom.xml jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java jetty-spdy/pom.xml jetty-spdy/spdy-core/pom.xml jetty-spdy/spdy-jetty-http-webapp/pom.xml jetty-spdy/spdy-jetty-http/pom.xml jetty-spdy/spdy-jetty/pom.xml jetty-start/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml test-jetty-webapp/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/pom.xml tests/test-sessions/pom.xml tests/test-sessions/test-hash-sessions/pom.xml tests/test-sessions/test-jdbc-sessions/pom.xml tests/test-sessions/test-mongodb-sessions/pom.xml tests/test-sessions/test-sessions-common/pom.xml tests/test-webapps/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2013-05-27 16:47:27 +10:00
Jesse McConnell	106a32a733	set for dev	2013-05-22 10:43:47 -05:00
Jesse McConnell	e5174f9cef	set for dev	2013-05-22 10:38:56 -05:00
Jesse McConnell	3dcceaed35	Updating VERSION.txt top section	2013-05-20 06:51:30 -05:00
Jesse McConnell	13fb43ea6d	Updating VERSION.txt top section	2013-05-20 06:48:15 -05:00
Greg Wilkins	1cb201ef14	Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: VERSION.txt example-jetty-embedded/pom.xml jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-all/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-plus/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-ajp/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-distribution/src/main/resources/bin/jetty.sh jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nested/pom.xml jetty-nosql/pom.xml jetty-osgi/jetty-osgi-boot-jsp/pom.xml jetty-osgi/jetty-osgi-boot-warurl/pom.xml jetty-osgi/jetty-osgi-boot/pom.xml jetty-osgi/jetty-osgi-httpservice/pom.xml jetty-osgi/pom.xml jetty-osgi/test-jetty-osgi-context/pom.xml jetty-osgi/test-jetty-osgi-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-rewrite/pom.xml jetty-security/pom.xml jetty-server/pom.xml jetty-servlet/pom.xml jetty-servlets/pom.xml jetty-spdy/pom.xml jetty-spdy/spdy-core/pom.xml jetty-spdy/spdy-jetty-http-webapp/pom.xml jetty-spdy/spdy-jetty-http/pom.xml jetty-spdy/spdy-jetty/pom.xml jetty-start/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml test-jetty-webapp/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/pom.xml tests/test-sessions/pom.xml tests/test-sessions/test-hash-sessions/pom.xml tests/test-sessions/test-jdbc-sessions/pom.xml tests/test-sessions/test-mongodb-sessions/pom.xml tests/test-sessions/test-sessions-common/pom.xml tests/test-webapps/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2013-03-14 12:40:29 +11:00
Jesse McConnell	0959b5a848	set for dev	2013-03-12 14:24:55 -05:00
Jesse McConnell	728dada3b0	set for dev	2013-03-12 14:24:34 -05:00
Jesse McConnell	04732ab345	set for release	2013-03-12 08:38:25 -05:00
Jesse McConnell	c83e023ac3	set for release	2013-03-12 08:35:57 -05:00
Greg Wilkins	e8de7bd905	Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: VERSION.txt example-jetty-embedded/pom.xml jetty-aggregate/jetty-all-server/pom.xml jetty-aggregate/jetty-all/pom.xml jetty-aggregate/jetty-client/pom.xml jetty-aggregate/jetty-plus/pom.xml jetty-aggregate/jetty-server/pom.xml jetty-aggregate/jetty-servlet/pom.xml jetty-aggregate/jetty-webapp/pom.xml jetty-aggregate/jetty-websocket/pom.xml jetty-aggregate/pom.xml jetty-ajp/pom.xml jetty-annotations/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-monitor/pom.xml jetty-nested/pom.xml jetty-nosql/pom.xml jetty-osgi/jetty-osgi-boot-jsp/pom.xml jetty-osgi/jetty-osgi-boot-logback/pom.xml jetty-osgi/jetty-osgi-boot-warurl/pom.xml jetty-osgi/jetty-osgi-boot/pom.xml jetty-osgi/jetty-osgi-equinoxtools/pom.xml jetty-osgi/jetty-osgi-httpservice/pom.xml jetty-osgi/pom.xml jetty-osgi/test-jetty-osgi-context/pom.xml jetty-osgi/test-jetty-osgi-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-overlay-deployer/pom.xml jetty-plus/pom.xml jetty-policy/pom.xml jetty-rewrite/pom.xml jetty-security/pom.xml jetty-server/pom.xml jetty-servlet/pom.xml jetty-servlets/pom.xml jetty-spdy/pom.xml jetty-spdy/spdy-core/pom.xml jetty-spdy/spdy-jetty-http-webapp/pom.xml jetty-spdy/spdy-jetty-http/pom.xml jetty-spdy/spdy-jetty/pom.xml jetty-start/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/pom.xml jetty-xml/pom.xml pom.xml test-continuation/pom.xml test-jetty-nested/pom.xml test-jetty-servlet/pom.xml test-jetty-webapp/pom.xml tests/pom.xml tests/test-integration/pom.xml tests/test-loginservice/pom.xml tests/test-sessions/pom.xml tests/test-sessions/test-hash-sessions/pom.xml tests/test-sessions/test-jdbc-sessions/pom.xml tests/test-sessions/test-mongodb-sessions/pom.xml tests/test-sessions/test-sessions-common/pom.xml tests/test-webapps/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2013-02-01 18:22:04 +11:00
Jesse McConnell	1101aec2d1	set for dev	2013-01-31 13:20:34 -06:00
Jesse McConnell	0a1fbc7ea0	set for release	2013-01-31 11:08:08 -06:00
Jesse McConnell	81d3c76780	prep for dev	2013-01-31 10:41:05 -06:00
Jesse McConnell	ade2e15318	Set for release	2013-01-31 08:03:42 -06:00
Jesse McConnell	2e2c07dad9	Set for release	2013-01-31 08:02:54 -06:00
Hugues Malphettes	e999c45bad	394294 Start web-bundles started before jetty ... A web-bundle started before jetty-osgi should be deployed as a webapp when jetty-osgi starts. Thanks to Constantine Nosovsky for the patch.	2012-11-23 18:29:07 +08:00
Greg Wilkins	b3274a6baa	Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: VERSION.txt	2012-11-08 14:41:01 +11:00
Jesse McConnell	d0819605af	set for dev	2012-11-06 12:01:06 -06:00
Jesse McConnell	edf898bdd1	set for dev	2012-11-06 09:00:48 -06:00
Jesse McConnell	6fc39fc781	set for release	2012-11-06 07:45:17 -06:00
Jesse McConnell	ec2fb110f1	reset	2012-11-06 07:44:12 -06:00
Jesse McConnell	7fadb8548b	set for release	2012-11-06 07:41:59 -06:00
Jesse McConnell	581779a9df	reset	2012-11-06 07:37:07 -06:00
Jesse McConnell	9bf7d89190	set for dev	2012-11-05 14:39:50 -06:00
Jesse McConnell	c74a56582a	set for dev	2012-11-05 13:24:43 -06:00
Jesse McConnell	d3565e8610	Updating VERSION.txt top section	2012-11-05 11:55:10 -06:00
Jesse McConnell	92e2ad44fc	Updating VERSION.txt top section	2012-11-05 11:45:59 -06:00
Jesse McConnell	c7f8bdfee8	prep for dev	2012-09-10 16:10:42 -05:00
Jesse McConnell	ff2b988eff	prep for dev	2012-09-10 15:40:04 -05:00
Jesse McConnell	0c3f1b6ab1	prep for release	2012-09-10 13:15:40 -05:00
Jesse McConnell	4180d7e1f5	prepare for release	2012-09-10 12:59:04 -05:00
Jesse McConnell	83781bce8d	prepare for release	2012-09-10 12:57:18 -05:00
Jesse McConnell	33ce6e6787	prep for dev	2012-09-03 16:23:44 -05:00
Jesse McConnell	fb929aca20	prep for dev	2012-09-03 14:32:38 -05:00
Jesse McConnell	ff57f913e8	Updating VERSION.txt top section	2012-09-03 12:53:24 -05:00
Jesse McConnell	1587c3e8c5	Updating VERSION.txt top section	2012-09-03 12:49:16 -05:00