Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,527 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

728 Commits

Author SHA1 Message Date
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 b132663c2b jetty-9 made WebAppContext configuration additive 2013-01-31 12:21:04 +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 27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11: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 2aab780eba Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
 2013-01-07 23:45:38 +11:00
Greg Wilkins ccda9bb10b 397535 Support pluggable alias checking to support symbolic links 2013-01-07 19:57:52 +11:00
Jan Bartel 346918577f Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
	test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
	test-jetty-webapp/src/main/java/com/acme/CookieDump.java
	test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
 2012-12-22 15:12:17 +11:00
Joakim Erdfelt 69b9856998 Squashing JMX warnings on jetty startup 2012-12-19 13:50:51 -07:00
Jan Bartel f9e76b1620 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/ReadLineInputStream.java
 2012-12-14 11:48:55 +11:00
Jan Bartel 10deb68ced 396472 org.eclipse.jetty.websocket needs to be removed from serverclasses as it should only be a systemclass 2012-12-13 19:58:50 +11:00
Jan Bartel 99201dd521 396473 JettyWebXMlConfiguration does not reset serverclasses 2012-12-13 19:58:50 +11:00
Greg Wilkins a478271828 JETTY-1533 handle URL with no path 2012-12-13 07:59:21 +11:00
Jan Bartel e612c19eb7 JETTY-796 jetty ant plugin improvements 2012-12-07 16:27:17 +11:00
Greg Wilkins f0cc03ede5 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
 2012-11-22 17:01:55 +11:00
Jan Bartel 90a86d3a6b Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-22 16:26:38 +11:00
Greg Wilkins 597649d4aa 394719 remove regex from classpath matching 2012-11-22 15:41:01 +11:00
Jesse McConnell a0c1d85094 Revert "jetty-9 cleaned up serverClasses to minimum" 
This reverts commit 67b5caadbb.
 2012-11-19 10:33:54 -06:00
Greg Wilkins 67b5caadbb jetty-9 cleaned up serverClasses to minimum 2012-11-19 17:42:52 +11:00
Joakim Erdfelt d67fdfdd85 Splitting out websocket-servlet to make it more friendly for WebAppClassloader 2012-11-12 19:42:32 -07:00
Greg Wilkins 8ff291d223 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/TemplateContext.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
 2012-11-12 12:30:26 +11:00
Greg Wilkins 7ae264e30c jetty-9 corrections for documentation 2012-11-08 07:34:40 +11: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
Greg Wilkins 52464a5ba6 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
	jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
	jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
	test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
	test-jetty-webapp/src/main/java/com/acme/Dump.java
 2012-11-02 14:08:05 +11:00
Greg Wilkins 8723408731 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
 2012-11-02 13:17:53 +11:00
Greg Wilkins 65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Greg Wilkins 3683653052 393303 use jetty-web.xml to explicitly add the jetty packages that need visability. This commit also sucked in some changes made to help with the documentation process (improving deployer configuration management 2012-11-01 20:20:45 +11:00
Jan Bartel a74c9f176c 392237 Split jaas from jetty-plus into jetty-jaas and port the test-jaas-webapp from codehaus 2012-10-29 18:21:37 +11:00
Greg Wilkins 2b13648b0e 392237 fixed many TODOs and many minor code cleanups 2012-10-19 16:17:30 +11:00
Greg Wilkins f420f5016d 392237 Implemented HttpOutput.sendContent for large content 2012-10-19 10:16:30 +11:00
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
Jan Bartel 0ad8913034 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-18 16:43:03 +11:00
Jan Bartel 4769ada666 392239 Allow no error-code or exception for error-pages 2012-10-18 16:34:15 +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 3146a83372 Merge remote-tracking branch 'origin/jetty-8' 2012-10-18 09:57:53 +11:00
Jan Bartel 6d26b45afe 391877 org.eclipse.jetty.webapp.FragmentDescriptor incorrectly reporting duplicate others for after ordering 2012-10-15 12:12:53 +11:00
Greg Wilkins fac580c374 Merge remote-tracking branch 'origin/jetty-8' into jetty-9 
Conflicts:
	VERSION.txt
	example-async-rest/async-rest-jar/pom.xml
	example-async-rest/async-rest-webapp/pom.xml
	example-async-rest/pom.xml
	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-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/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java
	jetty-annotations/pom.xml
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AbstractDiscoverableAnnotationHandler.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java
	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-http/src/main/java/org/eclipse/jetty/http/Generator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
	jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java
	jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
	jetty-io/src/main/java/org/eclipse/jetty/io/BufferUtil.java
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
	jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
	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-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
	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-runner/pom.xml
	jetty-security/pom.xml
	jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java
	jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
	jetty-server/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/main/java/org/eclipse/jetty/server/bio/SocketConnector.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
	jetty-server/src/test/resources/jetty-logging.properties
	jetty-servlet/pom.xml
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
	jetty-servlets/pom.xml
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
	jetty-spdy/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-server/pom.xml
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/pom.xml
	jetty-start/src/test/java/org/eclipse/jetty/start/CommandLineBuilderTest.java
	jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-webapp/pom.xml
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
	jetty-websocket/pom.xml
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/MessageSender.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java
	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
	test-jetty-webapp/src/main/webapp/WEB-INF/web.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
 2012-10-12 21:19:21 +11:00
Jan Bartel ce3ba58887 390163 Implement ServletRegistration.Dynamic.setServletSecurity 2012-09-29 16:15:55 +10:00
Jan Bartel c7e36470c5 390503 http-method-omission element not being processed 2012-09-28 20:16:52 +10:00
Jan Bartel 95298f27c7 JETTY-1547 Jetty does not honor web.xml web-app/jsp-config/jsp-property-group/default-content-type 2012-09-27 07:25:34 +10:00
Greg Wilkins 879cdf4b82 jetty-9 further lifecycle improvements 2012-09-21 16:17:00 +10:00
Joakim Erdfelt 857498b115 Upgrading to junit-dep-4.10.jar (banning junit.jar) 2012-09-20 11:52:59 -07:00
Simone Bordet 40382bad3a jetty-9 - Removed references to JUnit 3.x. 2012-09-20 18:23:02 +02:00
Jan Bartel 394c478b19 389452 if web-fragment metadata-complete==true still scan its related jar if there there is a ServletContainerInitializer 
Also some refactoring to simplify scanning for annotations/classes.
 2012-09-14 16:51:53 +10:00
Jan Bartel 7af01587a8 389390 AnnotationConfiguration is ignored if the metadata-complete attribute is present in an override descriptor regardless of the value 2012-09-13 11:29:36 +10:00
Jesse McConnell a8994178f5 [maven-release-plugin] prepare for next development iteration 2012-09-10 14:18:11 -05:00
Jesse McConnell 92180a9700 [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 14:18:01 -05:00
Jesse McConnell 10e4027579 [maven-release-plugin] prepare for next development iteration 2012-09-10 13:59:34 -05:00
Jesse McConnell 57a6258f96 [maven-release-plugin] prepare release jetty-8.1.7.v20120910 2012-09-10 13:59:10 -05:00
Jesse McConnell 1ec8b2621b [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 13:47:05 -05:00
Jesse McConnell 4180d7e1f5 prepare for release 2012-09-10 12:59:04 -05:00
Greg Wilkins 2dfcebfc04 jetty-9 distribution working 2012-09-06 14:54:55 +10:00
Jesse McConnell d37deeea74 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:18 -05:00
Jesse McConnell b418b0dd57 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:16 -05:00
Jesse McConnell 41e9b1f6e2 [maven-release-plugin] prepare release jetty-7.6.6.v20120903 2012-09-03 13:33:10 -05:00
Jesse McConnell 6c0b0af2fe [maven-release-plugin] prepare release jetty-8.1.6.v20120903 2012-09-03 13:33:08 -05:00
Greg Wilkins 83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +10:00
Jan Bartel c7b9081a52 Merge remote-tracking branch 'origin/master' into jetty-8 2012-08-30 16:16:44 +10:00
Simone Bordet dd8958ffe8 Jetty9 - Fixed parsing in case of a <Configure> element without <Arg> elements, 
which may happen if the configuration is not the one that creates the Server instance,
but just adds additional configuration to it.

Also took the chance to JDK7-ify the code and remove old cruft and unused code.
 2012-08-29 11:49:41 +02:00
Jan Bartel 28667f1707 387953 jstl does not work with jetty-7 in osgi 2012-08-27 14:05:05 +10:00
Simone Bordet 06b2de17d5 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 11:52:29 +02:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Jesse McConnell 2d9c4e823c migrate jetty-webapp to jmx annotations 2012-08-15 13:49:07 -05:00
Greg Wilkins 32c5f6c093 jetty-9 reduced LazyList usage 2012-08-08 11:58:50 +10:00
Simone Bordet e3132d41d8 Jetty9 - Introduced ConnectionFactory for SelectChannelConnector. 
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
 2012-08-03 18:35:34 +02:00
Greg Wilkins 96b5c05674 jetty-9 one connector passing most tests 2012-08-02 11:51:54 +10:00
Greg Wilkins b1750c0aae jetty-9 fixed bad merge of poms 2012-07-20 15:20:57 +10:00
Greg Wilkins 154a926b1b jetty-9 merge from jetty-8. Mostly compiling but some tests still failing. 
Merge remote-tracking branch 'origin/jetty-8' into jetty-9

Conflicts:
	example-async-rest/async-rest-jar/pom.xml
	example-async-rest/async-rest-webapp/pom.xml
	example-async-rest/pom.xml
	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-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-http/src/main/java/org/eclipse/jetty/http/gzip/CompressedResponseWrapper.java
	jetty-http/src/main/java/org/eclipse/jetty/http/gzip/GzipStream.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffers.java
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
	jetty-io/src/main/java/org/eclipse/jetty/io/AsyncEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
	jetty-io/src/main/java/org/eclipse/jetty/io/BuffersFactory.java
	jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java
	jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/ConnectedEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java
	jetty-io/src/main/java/org/eclipse/jetty/io/PooledBuffers.java
	jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/bio/StringEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
	jetty-io/src/test/java/org/eclipse/jetty/io/ChannelEndPointTest.java
	jetty-io/src/test/java/org/eclipse/jetty/io/bio/SocketEndPointTest.java
	jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
	jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java
	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/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/GzipHandler.java
	jetty-server/src/main/java/org/eclipse/jetty/server/nio/SelectChannelConnector.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
	jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/SuspendHandler.java
	jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/session/SessionHandlerTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
	jetty-servlet/pom.xml
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlets/pom.xml
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/IncludableGzipFilterTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-spdy/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionDictionary.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionFactory.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Controller.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/ISession.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IStream.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IdleListener.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Promise.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/PushSynInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/SessionException.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardCompressionFactory.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StreamException.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ByteBufferDataInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/BytesDataInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/GoAwayInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Headers.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/HeadersInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PingInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ReplyInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/RstInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDY.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDYException.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Session.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionFrameListener.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionStatus.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Settings.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SettingsInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Stream.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamFrameListener.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamStatus.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StringDataInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SynInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/server/ServerSessionFrameListener.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrameType.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/NoOpFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/ControlFrameGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/Generator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/GoAwayGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/NoOpGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/PingGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/RstStreamGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SettingsGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynReplyGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynStreamGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/WindowUpdateGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/DataFrameParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/GoAwayBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/NoOpBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/Parser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/PingBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/RstStreamBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SettingsBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynReplyBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynStreamBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/WindowUpdateBodyParser.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/AsyncTimeoutTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardStreamTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ServerUsageTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/DataGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/GoAwayGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/HeadersGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/NoOpGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/PingGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/RstStreamGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SettingsGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynReplyGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynStreamGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/TestSPDYParserListener.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/WindowUpdateGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/LiveChromiumRequestParserTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/ParseVersusCacheBenchmarkTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameTest.java
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/PushStrategy.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategy.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPAsyncConnectionFactory.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnectionFactory.java
	jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java
	jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ConcurrentStreamsTest.java
	jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ProtocolNegotiationTest.java
	jetty-spdy/spdy-jetty/pom.xml
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/AsyncConnectionFactory.java
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncConnection.java
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncEndPoint.java
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYClient.java
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYServerConnector.java
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/ServerSPDYAsyncConnectionFactory.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ClosedStreamTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/FlowControlTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/HeadersTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ProtocolViolationsTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PushStreamTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ResetStreamTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SPDYClientFactoryTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SPDYServerConnectorTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLEngineLeakTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLSynReplyTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SettingsTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynDataReplyDataLoadTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynReplyTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/UnsupportedVersionTest.java
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketHandler.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SafariD00.java
	jetty-xml/pom.xml
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
	jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
	pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-servlet/src/main/java/Jetty400Repro.java
	test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java
	test-jetty-servlet/src/test/java/org/eclipse/jetty/testing/HttpTesterTest.java
	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-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
 2012-07-20 11:07:57 +10:00
Jesse McConnell 136514948f [maven-release-plugin] prepare for next development iteration 2012-07-16 13:24:49 -05:00
Jesse McConnell 1bbc677a09 [maven-release-plugin] prepare release jetty-8.1.5.v20120716 2012-07-16 13:24:42 -05:00
Jesse McConnell f755d014cd [maven-release-plugin] prepare for next development iteration 2012-07-16 13:23:59 -05:00
Jesse McConnell 04b7e807a0 [maven-release-plugin] prepare release jetty-7.6.5.v20120716 2012-07-16 13:23:53 -05:00
Jesse McConnell c00bb2d6ca reset for release 2012-07-16 12:55:22 -05:00
Jesse McConnell f59b2a0632 reset release 2012-07-16 12:54:36 -05:00
Jesse McConnell 205e8f74f0 [maven-release-plugin] prepare for next development iteration 2012-07-13 10:20:48 -05:00
Jesse McConnell c3b5269d60 [maven-release-plugin] prepare release jetty-8.1.5.v20120713 2012-07-13 10:20:23 -05:00
Jesse McConnell 12ecc10c6a [maven-release-plugin] prepare for next development iteration 2012-07-13 09:35:08 -05:00
Jesse McConnell bf40110fb8 [maven-release-plugin] prepare release jetty-7.6.5.v20120713 2012-07-13 09:34:52 -05:00
Jesse McConnell 81d72052c8 merged master to jetty-8 2012-07-11 14:04:49 -05:00
Jesse McConnell aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Jan Bartel 96fe2d6c3f JETTY-1523 It is imposible to map servlet to "/" using WebApplicationInitializer 2012-07-04 17:11:11 +02:00
Jan Bartel a7b1dd5e93 Merge remote-tracking branch 'origin/master' into jetty-8 2012-06-07 00:59:37 +02:00
Greg Wilkins 792509d459 jetty-9 jetty-deployer passing tests 2012-06-06 15:27:56 +02:00
Jan Bartel dc3c77b5f6 381712 Support all declared servlets that implement org.apache.jasper.servlet.JspServlet 2012-06-06 15:00:42 +02:00
Jan Bartel 5b3999a7f4 381712 Anoint all JspServlets with correct environment 2012-06-05 15:42:28 +02:00
Jan Bartel 9149a69446 Merge remote-tracking branch 'origin/master' into jetty-8 2012-06-04 13:49:25 +02:00
Jan Bartel 1bfb7df771 381402 Make ContextHandler take set of protected directories 2012-06-04 12:02:40 +02:00
Jesse McConnell 30e8e40ef2 [maven-release-plugin] prepare for next development iteration 2012-05-24 15:41:45 -05:00
Jesse McConnell 667cf9a643 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 15:41:38 -05:00
Jesse McConnell d23a3c90b5 [maven-release-plugin] prepare for next development iteration 2012-05-24 15:40:47 -05:00
Jesse McConnell 57c73283d8 [maven-release-plugin] prepare release jetty-7.6.4.v20120524 2012-05-24 15:40:35 -05:00
Jesse McConnell e45a89694a [maven-release-plugin] prepare for next development iteration 2012-05-24 09:30:58 -05:00
Jesse McConnell 36fc6fe890 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 09:30:52 -05:00
Jesse McConnell 035e16aedc [maven-release-plugin] prepare for next development iteration 2012-05-24 09:27:27 -05:00
Jesse McConnell f8c629026d [maven-release-plugin] prepare release jetty-7.6.4.v20120524 2012-05-24 09:27:21 -05:00
Jesse McConnell c7a9adaa32 reset for release 2012-05-24 08:33:44 -05:00
Jesse McConnell c8fe38733f reset versions for release 2012-05-24 08:30:26 -05:00
Jesse McConnell ea176f0586 [maven-release-plugin] prepare for next development iteration 2012-05-22 15:14:05 -05:00
Jesse McConnell 3fdda881d8 [maven-release-plugin] prepare release jetty-8.1.4.v20120522 2012-05-22 15:13:56 -05:00
Jesse McConnell 300a37319a [maven-release-plugin] prepare for next development iteration 2012-05-22 14:34:10 -05:00
Jesse McConnell 9ccd059375 [maven-release-plugin] prepare release jetty-7.6.4.v20120522 2012-05-22 14:33:59 -05:00
Jan Bartel 2131a40559 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-07 13:54:30 +02:00
Jan Bartel b131a0b30b 378242 Re-extract war on restart if incomplete extraction 
Also removed unneeded .active files (used by a jetty-6 feature to try to overcome sun bug on tmp files not being deleted on windows that has not been ported to jetty-7)
 2012-05-02 15:01:08 +02:00
Greg Wilkins fbac246a41 376152 apply context resources recursively 2012-04-25 18:17:35 +10:00
Greg Wilkins 5e83df20c8 various sonar/findbug code cleanups 2012-04-25 00:00:54 +10:00
Jesse McConnell b64909900c [maven-release-plugin] prepare for next development iteration 2012-04-13 15:31:47 -05:00
Jesse McConnell 2c0a35d430 [maven-release-plugin] prepare release jetty-8.1.3.v20120413 2012-04-13 15:31:38 -05:00
Jesse McConnell b963840d40 [maven-release-plugin] prepare for next development iteration 2012-04-13 15:29:14 -05:00
Jesse McConnell a652ee7396 [maven-release-plugin] prepare release jetty-7.6.3.v20120413 2012-04-13 15:29:05 -05:00
Simone Bordet 72040202d4 Reverted release back to 8.1.3-SNAPSHOT. 2012-04-13 17:27:37 +02:00
Simone Bordet 85710fb9ea Reverted release back to 7.6.3-SNAPSHOT. 2012-04-13 16:59:06 +02:00
Jesse McConnell 3b87e91cbe [maven-release-plugin] prepare for next development iteration 2012-04-12 10:29:30 -05:00
Jesse McConnell 308b010744 [maven-release-plugin] prepare release jetty-8.1.3.v20120412 2012-04-12 10:29:20 -05:00
Jesse McConnell cdcc0922c3 [maven-release-plugin] prepare for next development iteration 2012-04-12 09:49:52 -05:00
Jesse McConnell 5966c86571 [maven-release-plugin] prepare release jetty-7.6.3.v20120412 2012-04-12 09:49:46 -05:00
Jan Bartel 1fbe298bd6 374881 Set copyWebInf to false by default 2012-04-12 23:01:33 +10:00
Greg Wilkins ee2d289f63 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-npn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
 2012-04-12 16:02:34 +10:00
Jan Bartel f81ea12320 375709 Ensure resolveTempDirectory failure does not deadlock; improve error message 2012-04-11 12:37:51 +10:00
Jan Bartel 17269583fb Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-30 12:05:46 +11:00
Jan Bartel ef0d6d32f9 374881 Ensure setCopyWebInf(true) only copies WEB-INF if !setCopyWebDir(true) 2012-03-28 19:27:06 +11:00
Jan Bartel 83ce567e66 Add missing test from jetty-7 2012-03-15 09:53:12 +11:00
Jesse McConnell b4985ad0d5 [maven-release-plugin] prepare for next development iteration 2012-03-08 23:53:50 -06:00
Jesse McConnell 7a99af4ffe [maven-release-plugin] prepare release jetty-8.1.2.v20120308 2012-03-08 23:53:42 -06:00
Jesse McConnell 246e3ed756 [maven-release-plugin] prepare for next development iteration 2012-03-08 21:09:46 -06:00
Jesse McConnell a63b3fdc5e [maven-release-plugin] prepare release jetty-7.6.2.v20120308 2012-03-08 21:09:37 -06:00
Jesse McConnell 50d92ec8ef reset versions 2012-03-06 17:07:53 -06:00
Jesse McConnell f12e3c390c reset versions 2012-03-06 17:06:10 -06:00
Jesse McConnell d1c8c477ea [maven-release-plugin] prepare for next development iteration 2012-03-02 08:57:43 -06:00
Jesse McConnell b75868e84f [maven-release-plugin] prepare release jetty-8.1.2.v20120302 2012-03-02 08:57:19 -06:00
Jesse McConnell 51311d050e [maven-release-plugin] prepare for next development iteration 2012-03-02 08:37:46 -06:00
Jesse McConnell a8296ec3d5 [maven-release-plugin] prepare release jetty-7.6.2.v20120302 2012-03-02 08:37:38 -06:00
Jesse McConnell 0731cbe64d Merge branch 'master' into jetty-8 2012-02-22 14:42:39 -06:00
Thomas Becker 8de385992e 372256: fix if clause doing an || instead of && and thus always calling instanceOf on null values 2012-02-22 14:42:11 -06:00
Jesse McConnell ac79497dee [maven-release-plugin] prepare for next development iteration 2012-02-15 14:29:36 -06:00
Jesse McConnell 3705b424c8 [maven-release-plugin] prepare release jetty-8.1.1.v20120215 2012-02-15 14:29:28 -06:00
Jesse McConnell efb6883cf0 [maven-release-plugin] prepare for next development iteration 2012-02-15 14:22:19 -06:00
Jesse McConnell baf2b94f77 [maven-release-plugin] prepare release jetty-7.6.1.v20120215 2012-02-15 14:22:12 -06:00
Jesse McConnell 098428dd37 Merge branch 'master' into jetty-8 2012-02-15 13:49:23 -06:00
Greg Wilkins c1bcec61d5 jetty-9 jetty-io mostly working with all NIO buffers. Occassional failure in SSL stress test 2012-02-07 11:32:00 +11:00
Joakim Erdfelt 9207423ca0 Fixing JDK5 build abort due to bad javadocs 2012-02-06 10:01:44 -07:00
Jesse McConnell 6e44f4db5f [maven-release-plugin] prepare for next development iteration 2012-01-27 08:15:45 -06:00
Jesse McConnell 9d1ca3593e [maven-release-plugin] prepare release jetty-8.1.0.v20120127 2012-01-27 08:15:38 -06:00
Jesse McConnell ad6126553b [maven-release-plugin] prepare for next development iteration 2012-01-27 08:13:06 -06:00
Jesse McConnell 4e25f7bb05 [maven-release-plugin] prepare release jetty-7.6.0.v20120127 2012-01-27 08:13:00 -06:00
Jesse McConnell f2d0fd3cc8 revert back to 8.1.0-SNAPSHOT 2012-01-26 10:45:06 -06:00
Jesse McConnell 7ac9eb585f revert back to 7.6.0-SNAPSHOT 2012-01-26 10:42:11 -06:00
Jesse McConnell e98ae91ca6 [maven-release-plugin] prepare for next development iteration 2012-01-25 11:16:11 -06:00
Jesse McConnell fb30166a7f [maven-release-plugin] prepare release jetty-8.1.0.v20120125 2012-01-25 11:16:05 -06:00
Jesse McConnell c918bb4e3c Merge branch 'master' into jetty-8 2012-01-25 10:31:44 -06:00
Jesse McConnell 0c96fc40ea [maven-release-plugin] prepare for next development iteration 2012-01-25 09:31:06 -06:00
Jesse McConnell b455b7d94e [maven-release-plugin] prepare release jetty-7.6.0.v20120125 2012-01-25 09:30:55 -06:00
Greg Wilkins ae5ddb2930 369216 turned off the shared resource cache 2012-01-23 14:31:25 +11:00
Jan Bartel 6e3c8094f1 368112 NPE on <jsp-config><taglib> element parsing web.xml 2012-01-09 11:07:41 +11:00
Jan Bartel 0dfc9feaf9 367383 jsp-config element must be returned for ServletContext.getJspConfigDescriptor 2011-12-22 19:30:01 +11:00
hmalphettes 89afbdf31d 360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6 2011-12-02 17:27:26 +08:00
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'" 
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
 2011-11-30 16:27:30 +11:00
Greg Wilkins 631b0ba1b6 [maven-release-plugin] prepare for next development iteration 2011-11-30 13:16:54 +11:00
Greg Wilkins 9d3745f999 [maven-release-plugin] prepare release jetty-8.1.0.RC0 2011-11-30 13:16:41 +11:00
Jan Bartel cbec18af60 364430 Support web.xml enabled state for servlets 2011-11-22 14:09:45 +11:00
Jan Bartel 837f8d33c4 364283 can't parse the servlet multipart-config for the web.xml 2011-11-22 12:17:07 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Greg Wilkins 61664d3c0f Added concept of SslConnection 2011-10-26 01:15:59 +11:00
Jesse McConnell d5320d95ba [maven-release-plugin] prepare for next development iteration 2011-10-24 15:02:30 -05:00
Jesse McConnell d02f74a50c [maven-release-plugin] prepare release jetty-8.0.4.v20111024 2011-10-24 15:02:23 -05:00
Jan Bartel fc497fe1e8 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-24 16:30:10 +11:00
Greg Wilkins a642f7b55c Merge remote-tracking branch 'origin/master' into jetty-7.6 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
 2011-10-24 11:27:42 +11:00
Greg Wilkins cd0628ab66 Added isDebugEnabled guards to debugging that generates garbage 2011-10-22 09:39:54 +11:00
Greg Wilkins 5140a95144 refactored HttpConnection name 2011-10-20 15:12:19 +11:00
Greg Wilkins 6edb7c1930 organised imports 2011-10-18 15:05:22 +11:00
Jesse McConnell a38f2a9e68 [maven-release-plugin] prepare for next development iteration 2011-10-11 10:16:54 -05:00
Jesse McConnell 55a1be5435 [maven-release-plugin] prepare release jetty-8.0.3.v20111011 2011-10-11 10:16:47 -05:00
Jesse McConnell 7d10182034 [maven-release-plugin] prepare for next development iteration 2011-10-11 08:47:07 -05:00
Jesse McConnell b6ac542604 [maven-release-plugin] prepare release jetty-7.5.3.v20111011 2011-10-11 08:47:00 -05:00
Jesse McConnell b55ec9bac1 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:59:52 -05:00
Jesse McConnell e32e8b1377 [maven-release-plugin] prepare release jetty-8.0.2.v20111006 2011-10-06 17:59:46 -05:00
Jesse McConnell 0c55c774d4 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:25:38 -05:00
Jesse McConnell 4d822759de [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 17:25:32 -05:00
Jesse McConnell b58006b4a4 [maven-release-plugin] prepare for next development iteration 2011-10-06 09:43:37 -05:00
Jesse McConnell 7eca345e8d [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 09:43:31 -05:00
Jan Bartel d862348b4c Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
 2011-10-06 18:31:57 +11:00
Jan Bartel a8f24a2b64 360066 jsps referenced in web.xml <jsp-file> elements do not compile 2011-10-06 17:32:31 +11:00
Jan Bartel 32dbb1bddb Merge remote-tracking branch 'origin/master' 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/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-deploy/src/main/config/etc/jetty-deploy.xml
	jetty-distribution/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/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-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	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/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
	jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.xml
	jetty-osgi/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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-servlet/pom.xml
	jetty-servlets/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-jetty6/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-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
 2011-10-04 17:45:15 +11:00
Jan Bartel 8d6f64c902 358687 Updated jsp does not scan for system tlds 2011-09-23 14:51:25 +10:00
Jan Bartel 73a8065132 357209 JSP tag listeners not called 2011-09-12 14:47:09 +10:00
Jesse McConnell d5304b2cbc [maven-release-plugin] prepare for next development iteration 2011-09-08 12:20:15 -05:00
Jesse McConnell c33548d38a [maven-release-plugin] prepare release jetty-8.0.1.v20110908 2011-09-08 12:19:24 -05:00
Jesse McConnell ebdb89dc23 [maven-release-plugin] prepare for next development iteration 2011-09-08 12:00:16 -05:00
Jesse McConnell 932245a114 [maven-release-plugin] prepare release jetty-7.5.1.v20110908 2011-09-08 12:00:10 -05:00
Jesse McConnell 721c8ab682 updating version.txt and resetting pom version to 8.0.1-SNAPSHOT 2011-09-08 11:54:53 -05:00
Jesse McConnell 37d0f53b0a updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT 2011-09-08 11:40:37 -05:00
Jesse McConnell 4e47d6a7fa [maven-release-plugin] prepare for next development iteration 2011-09-07 18:16:58 -05:00
Jesse McConnell d77a12962b [maven-release-plugin] prepare release jetty-8.0.1.v20110907 2011-09-07 18:16:50 -05:00
Jesse McConnell 6b614a54f0 [maven-release-plugin] prepare for next development iteration 2011-09-07 18:12:16 -05:00
Jesse McConnell ce55c8c601 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 18:12:09 -05:00
Jesse McConnell 7c7fc30b90 Merge over from jetty 7 master 2011-09-07 16:08:35 -05:00
Jesse McConnell 1744b5bce1 reset from release 2011-09-07 11:09:46 -05:00
Jesse McConnell ae86ad6d4e [maven-release-plugin] prepare for next development iteration 2011-09-07 10:03:16 -05:00
Jesse McConnell 86383afbd2 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 10:03:10 -05:00
Simone Bordet 5297d98350 Fixes #356693 (Too much of the websocket implementation is exposed to the webapp). 
WebSocketServlet must be loaded from the webapp classloader, even if the webapp is configured to have parent classloader priority.
 2011-09-05 13:45:33 +02:00
Greg Wilkins 898dcc8b2a 356693 reduce visibility to webapp of websocket implementations 2011-09-05 11:24:37 +10:00
Jesse McConnell 40dcb10ed8 [maven-release-plugin] prepare for next development iteration 2011-09-01 12:24:32 -05:00
Jesse McConnell db14b194fa [maven-release-plugin] prepare release jetty-8.0.0.v20110901 2011-09-01 12:24:24 -05:00
Jesse McConnell a728021edf [maven-release-plugin] prepare for next development iteration 2011-09-01 11:17:05 -05:00
Jesse McConnell 882308f781 [maven-release-plugin] prepare release jetty-7.5.0.c20110901 2011-09-01 11:16:58 -05:00
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Jesse McConnell 57e9045635 [maven-release-plugin] prepare for next development iteration 2011-08-31 14:17:32 -05:00
Jesse McConnell 317491a4d7 [maven-release-plugin] prepare release jetty-7.5.0.v20110901 2011-08-31 14:17:25 -05:00
Joakim Erdfelt e60df19490 [maven-release-plugin] prepare for next development iteration 2011-08-30 13:13:46 -07:00
Joakim Erdfelt 460c754e4e [maven-release-plugin] prepare release jetty-7.5.0.RC2 2011-08-30 13:13:39 -07:00
Joakim Erdfelt 7663a83616 [maven-release-plugin] rollback the release of jetty-7.5.0.RC2 2011-08-30 12:52:45 -07:00
Joakim Erdfelt 4c5c954d23 [maven-release-plugin] prepare release jetty-7.5.0.RC2 2011-08-30 12:47:42 -07:00
Joakim Erdfelt 79db394552 Merge from trunk 2011-08-26 10:12:45 -07:00
Jesse McConnell af07e1cef8 [Bug 355854] remove automatic conversion in favor of issuing a warning for jetty-web.xml that can't be processed 2011-08-26 11:12:25 -05:00
Jesse McConnell 05fe9dc2d4 [Bug 355854] provide simple mechanism to convert jetty6 jetty-web.xml files to jetty7 on the fly 2011-08-26 11:12:24 -05:00
Jesse McConnell 06881d2717 [Bug 355854] provide simple mechanism to convert jetty6 jetty-web.xml files to jetty7 on the fly 2011-08-26 11:12:24 -05:00
Joakim Erdfelt 3399242d83 293739 - Deprecate static Jetty Log usage in favor of named logs 
+ Finished conversion of jetty-ajp, jetty-client, jetty-deploy,
jetty-jaspi, jetty-jndi, jetty-plus, jetty-webapp
 2011-08-24 13:01:00 -07:00
Greg Wilkins e5a3cb9cef [maven-release-plugin] prepare for next development iteration 2011-08-19 22:17:46 +10:00
Greg Wilkins f0b4ffffda [maven-release-plugin] prepare release jetty-7.5.0.RC1 2011-08-19 22:17:33 +10:00
Jesse McConnell 4700979200 [maven-release-plugin] prepare for next development iteration 2011-08-16 09:26:56 -05:00
Jesse McConnell 3ae78dfbb2 [maven-release-plugin] prepare release jetty-8.0.0.RC0 2011-08-16 09:26:48 -05:00
Jesse McConnell 4d7ba354e1 [maven-release-plugin] prepare for next development iteration 2011-08-15 14:18:53 -05:00
Jesse McConnell 2175bae0a0 [maven-release-plugin] prepare release jetty-7.5.0.RC0 2011-08-15 14:18:42 -05:00
Jan Bartel 02a66a00fb Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	VERSION.txt
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
	pom.xml
 2011-08-01 14:39:39 +10:00
Jesse McConnell 062feb4750 [Bug 353165] remove a directory check for directories of jar files, 
rational being that some users wish to point to unpacked jar files
using symbolic links and this was preventing that behavior
 2011-07-29 11:21:13 -05:00
Jan Bartel fb8fb0e2f8 353095 - maven-jetty-plugin: PermGen leak due to javax.el.BeanELResolver 
Also found that java beans can be leaked via java.beans.Introspector so fixed that too.
 2011-07-29 11:05:45 +10:00
Jan Bartel 93cc111a02 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	VERSION.txt
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
 2011-07-25 17:42:30 +10:00
Jesse McConnell ba30be6408 [Bug 349005] add javadoc detailing the convenience hack of removing 
leading /'s
 2011-07-21 08:51:44 -05:00
Jesse McConnell 3919023be5 [Bug 352133] resolve some 1.5isms 2011-07-18 12:54:19 -05:00
Greg Wilkins 70d7d3c9a5 reverted version 2011-07-18 09:15:31 +10:00
Greg Wilkins a26ddd5933 created performance version 2011-07-14 15:38:25 +10:00
Jan Bartel 86f7e76c4d Merge of 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/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/pom.xml
	jetty-io/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/pom.xml
	jetty-nested/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/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/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/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/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-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
 2011-07-11 12:05:58 +10:00
Jesse McConnell 39674f8a8e [maven-release-plugin] prepare for next development iteration 2011-07-07 18:43:56 -05:00
Jesse McConnell 5aa94f502e [maven-release-plugin] prepare release jetty-7.4.4.v20110707 2011-07-07 18:43:50 -05:00
Greg Wilkins 17e907c2fb git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +10:00
Jesse McConnell 6190961f31 [maven-release-plugin] prepare for next development iteration 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3454 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-07-01 11:12:45 +00:00
Jesse McConnell db9f79eaff [maven-release-plugin] prepare release jetty-7.4.3.v20110701 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3452 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-07-01 11:12:33 +00:00
Greg Wilkins baabacfe95 reverted to 7.4.4-SNAPSHOT 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3448 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-07-01 02:22:56 +00:00
Jesse McConnell b9fffcb9a0 [maven-release-plugin] prepare for next development iteration 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3447 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-07-01 00:54:20 +00:00
Jesse McConnell ea23a83bb3 [maven-release-plugin] prepare release jetty-7.4.3.v20110630 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3445 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-07-01 00:54:07 +00:00
Jesse McConnell b1ca45e709 [maven-release-plugin] prepare for next development iteration 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3441 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-06-30 19:49:20 +00:00