725 Commits

Author	SHA1	Message	Date
Greg Wilkins	ab2e9c357f	Merge remote-tracking branch 'origin/jetty-9.2.x' ... Conflicts: jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java	2014-11-20 16:34:30 +11:00
Jan Bartel	9792cec6db	451529 Change sentinel class for finding jstl on classpath to org.apache.taglibs.standard.tag.rt.core.WhenTag	2014-11-19 17:20:55 +11:00
Greg Wilkins	aeccef2154	Merge remote-tracking branch 'origin/jetty-9.2.x' ... Conflicts: VERSION.txt aggregates/jetty-all/pom.xml apache-jsp/pom.xml apache-jstl/pom.xml examples/async-rest/async-rest-jar/pom.xml examples/async-rest/async-rest-webapp/pom.xml examples/async-rest/pom.xml examples/embedded/pom.xml examples/pom.xml jetty-alpn/jetty-alpn-client/pom.xml jetty-alpn/jetty-alpn-server/pom.xml jetty-alpn/pom.xml jetty-annotations/pom.xml jetty-ant/pom.xml jetty-cdi/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-fcgi/fcgi-client/pom.xml jetty-fcgi/fcgi-server/pom.xml jetty-fcgi/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaas/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-jspc-maven-plugin/pom.xml jetty-maven-plugin/pom.xml jetty-monitor/pom.xml jetty-nosql/pom.xml jetty-osgi/jetty-osgi-alpn/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/jetty-osgi-npn/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-plus/pom.xml jetty-proxy/pom.xml jetty-quickstart/pom.xml jetty-rewrite/pom.xml jetty-runner/pom.xml jetty-security/pom.xml jetty-server/pom.xml jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java jetty-servlet/pom.xml jetty-servlets/pom.xml jetty-spdy/pom.xml jetty-spdy/spdy-alpn-tests/pom.xml jetty-spdy/spdy-client/pom.xml jetty-spdy/spdy-core/pom.xml jetty-spdy/spdy-example-webapp/pom.xml jetty-spdy/spdy-http-client-transport/pom.xml jetty-spdy/spdy-http-common/pom.xml jetty-spdy/spdy-http-server/pom.xml jetty-spdy/spdy-npn-tests/pom.xml jetty-spdy/spdy-server/pom.xml jetty-spring/pom.xml jetty-start/pom.xml jetty-util-ajax/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/javax-websocket-client-impl/pom.xml jetty-websocket/javax-websocket-server-impl/pom.xml jetty-websocket/pom.xml jetty-websocket/websocket-api/pom.xml jetty-websocket/websocket-client/pom.xml jetty-websocket/websocket-common/pom.xml jetty-websocket/websocket-server/pom.xml jetty-websocket/websocket-servlet/pom.xml jetty-xml/pom.xml pom.xml tests/pom.xml tests/test-continuation/pom.xml tests/test-integration/pom.xml tests/test-loginservice/pom.xml tests/test-quickstart/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-jaas-webapp/pom.xml tests/test-webapps/test-jetty-webapp/pom.xml tests/test-webapps/test-jndi-webapp/pom.xml tests/test-webapps/test-mock-resources/pom.xml tests/test-webapps/test-proxy-webapp/pom.xml tests/test-webapps/test-servlet-spec/pom.xml tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2014-11-19 13:37:48 +11:00
Jan Bartel	07d3a30ff7	Upgrade version of pax-exam and equinox for jetty-osgi testing.	2014-11-13 19:16:52 +11:00
Jan Bartel	dc2b9b18a9	383207 Use BundleFileLocatorHelperFactory to obtain BundleFileLocatorHelper	2014-11-13 18:57:13 +11: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
Jan Bartel	8694d9265d	Merge remote-tracking branch 'origin/jetty-9.2.x' ... Conflicts: jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultTest.java jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipTester.java	2014-11-07 14:10:47 +11:00
Jan Bartel	244f97a9d1	Added extra debug to jetty osgi; added proper manifest to test-webapp-fragment	2014-11-07 11:43:23 +11: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
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
Jan Bartel	7d5c8f2a96	Merge remote-tracking branch 'origin/jetty-9.2.x'	2014-10-24 12:51:01 +11:00
Jan Bartel	1ab6d7398c	447979 Refactor to make MetaData responsible for progressively ordering web-inf jars	2014-10-24 12:48:15 +11:00
Joakim Erdfelt	9249ebb6ef	Using 9.2.4-SNAPSHOT for branch	2014-09-11 06:10:44 -07:00
Joakim Erdfelt	2755746def	Merge branch 'jetty-http2'	2014-09-11 05:56:55 -07:00
Jan Bartel	09e22c042c	443661 Rename manifest and service constants for jetty osgi resource fragment code	2014-09-10 16:28:29 +10:00
Greg Wilkins	5011993ddf	Merge remote-tracking branch 'origin/master' into jetty-http2 ... Conflicts: VERSION.txt aggregates/jetty-all/pom.xml apache-jsp/pom.xml apache-jstl/pom.xml examples/async-rest/async-rest-jar/pom.xml examples/async-rest/async-rest-webapp/pom.xml examples/async-rest/pom.xml examples/embedded/pom.xml examples/pom.xml jetty-alpn/jetty-alpn-client/pom.xml jetty-alpn/jetty-alpn-server/pom.xml jetty-alpn/pom.xml jetty-annotations/pom.xml jetty-ant/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-fcgi/fcgi-client/pom.xml jetty-fcgi/fcgi-server/pom.xml jetty-fcgi/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaas/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-jspc-maven-plugin/pom.xml jetty-maven-plugin/pom.xml jetty-monitor/pom.xml jetty-nosql/pom.xml jetty-osgi/jetty-osgi-alpn/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/jetty-osgi-npn/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-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java jetty-plus/pom.xml jetty-proxy/pom.xml jetty-quickstart/pom.xml jetty-rewrite/pom.xml jetty-runner/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-alpn-tests/pom.xml jetty-spdy/spdy-client/pom.xml jetty-spdy/spdy-core/pom.xml jetty-spdy/spdy-example-webapp/pom.xml jetty-spdy/spdy-http-client-transport/pom.xml jetty-spdy/spdy-http-common/pom.xml jetty-spdy/spdy-http-server/pom.xml jetty-spdy/spdy-npn-tests/pom.xml jetty-spdy/spdy-server/pom.xml jetty-spring/pom.xml jetty-start/pom.xml jetty-util-ajax/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/javax-websocket-client-impl/pom.xml jetty-websocket/javax-websocket-server-impl/pom.xml jetty-websocket/pom.xml jetty-websocket/websocket-api/pom.xml jetty-websocket/websocket-client/pom.xml jetty-websocket/websocket-common/pom.xml jetty-websocket/websocket-server/pom.xml jetty-websocket/websocket-servlet/pom.xml jetty-xml/pom.xml pom.xml tests/pom.xml tests/test-continuation/pom.xml tests/test-integration/pom.xml tests/test-loginservice/pom.xml tests/test-quickstart/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-sessions-common/pom.xml tests/test-webapps/pom.xml tests/test-webapps/test-jaas-webapp/pom.xml tests/test-webapps/test-jetty-webapp/pom.xml tests/test-webapps/test-jndi-webapp/pom.xml tests/test-webapps/test-mock-resources/pom.xml tests/test-webapps/test-proxy-webapp/pom.xml tests/test-webapps/test-servlet-spec/pom.xml tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2014-09-10 14:38:18 +10:00
Jesse McConnell	88b19abf52	[maven-release-plugin] prepare for next development iteration	2014-09-05 09:19:30 -05:00
Jesse McConnell	9bfeb2221f	[maven-release-plugin] prepare release jetty-9.2.3.v20140905	2014-09-05 09:19:23 -05:00
Jan Bartel	d9f285f5f5	Update versions of apache-jsp and servlet-api for osgi	2014-09-05 20:19:45 +10:00
Jan Bartel	7c882d76c5	Make annotations and JNDI wortk with OSGi	2014-09-05 18:35:15 +10:00
Jan Bartel	7199c6ceca	Switch to apache-jsp for jetty-osgi	2014-09-05 18:35:15 +10:00
Greg Wilkins	b47f9ef605	cleaned up OSGi manifest creation	2014-08-15 19:35:49 +10:00
Greg Wilkins	a14d843382	ignored osgi-spdy tests	2014-08-14 15:18:28 +10:00
Greg Wilkins	f81bb4c000	update OSGi for ssl home and base	2014-08-14 11:21:08 +10:00
Greg Wilkins	fa9b60c77e	Merge remote-tracking branch 'origin/jetty-http2' into pathresource	2014-08-01 10:17:42 +10:00
Greg Wilkins	252933891c	Merge branch 'master' into pathresource ... Conflicts: jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java	2014-07-31 14:05:26 +10:00
Greg Wilkins	66980f2449	Merge remote-tracking branch 'origin/master' into jetty-http2 ... Conflicts: VERSION.txt aggregates/jetty-all/pom.xml apache-jsp/pom.xml apache-jstl/pom.xml examples/async-rest/async-rest-jar/pom.xml examples/async-rest/async-rest-webapp/pom.xml examples/async-rest/pom.xml examples/embedded/pom.xml examples/pom.xml examples/quickstart/pom.xml jetty-alpn/jetty-alpn-client/pom.xml jetty-alpn/jetty-alpn-server/pom.xml jetty-alpn/pom.xml jetty-annotations/pom.xml jetty-ant/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-fcgi/fcgi-client/pom.xml jetty-fcgi/fcgi-server/pom.xml jetty-fcgi/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaas/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-jspc-maven-plugin/pom.xml jetty-maven-plugin/pom.xml jetty-monitor/pom.xml jetty-nosql/pom.xml jetty-osgi/jetty-osgi-alpn/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/jetty-osgi-npn/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-plus/pom.xml jetty-proxy/pom.xml jetty-quickstart/pom.xml jetty-rewrite/pom.xml jetty-runner/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-alpn-tests/pom.xml jetty-spdy/spdy-client/pom.xml jetty-spdy/spdy-core/pom.xml jetty-spdy/spdy-example-webapp/pom.xml jetty-spdy/spdy-http-client-transport/pom.xml jetty-spdy/spdy-http-common/pom.xml jetty-spdy/spdy-http-server/pom.xml jetty-spdy/spdy-npn-tests/pom.xml jetty-spdy/spdy-server/pom.xml jetty-spring/pom.xml jetty-start/pom.xml jetty-util-ajax/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/javax-websocket-client-impl/pom.xml jetty-websocket/javax-websocket-server-impl/pom.xml jetty-websocket/pom.xml jetty-websocket/websocket-api/pom.xml jetty-websocket/websocket-client/pom.xml jetty-websocket/websocket-common/pom.xml jetty-websocket/websocket-server/pom.xml jetty-websocket/websocket-servlet/pom.xml jetty-xml/pom.xml pom.xml tests/pom.xml tests/test-continuation/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-dispatch-webapp/pom.xml tests/test-webapps/test-jaas-webapp/pom.xml tests/test-webapps/test-jetty-webapp/pom.xml tests/test-webapps/test-jndi-webapp/pom.xml tests/test-webapps/test-mock-resources/pom.xml tests/test-webapps/test-proxy-webapp/pom.xml tests/test-webapps/test-servlet-spec/pom.xml tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml	2014-07-25 17:37:53 +10:00
Jan Bartel	f8bf40107a	436862 Update jetty-osgi to asm-5 and spifly-1.0.1	2014-07-25 15:32:41 +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
Joakim Erdfelt	8ec4e56681	Fixing compile error	2014-07-22 11:57:52 -07:00
Greg Wilkins	706fe1eba3	Merge remote-tracking branch 'origin/master' into jetty-http2	2014-07-03 16:01:37 +10:00
Jan Bartel	839485797b	437419 Allow scanning of META-INF for resources,fragments,tlds for unpacked jars	2014-07-01 10:40:58 +10:00
Joakim Erdfelt	9f844383cd	Making PathResource the default for "file://" resources ... + Making ResourceTest a proper @Parameterized test case + Moving jar tests out of ResourceTest into JarResourceTest + Moving classpath tests out of ResourceTest into ClassPathResourceTest + Making more improvements to PathResource to satisfy expecations in the rest of the codebase. + Requests for resource subpaths that use "//" in their strings will now work correctly (it used to result in null requests in FileResource)	2014-06-25 14:11:44 -07: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