154 Commits

Author	SHA1	Message	Date
Greg Wilkins	f89909e301	jetty-9 cleaning up dependencies	2012-11-23 16:25:57 +11:00
Thomas Becker	9044819085	394671: Fix setting loglevel on commandline via -Dorg.eclipse.jetty.LEVEL=DEBUG	2012-11-20 16:21:42 +01:00
Joakim Erdfelt	d67fdfdd85	Splitting out websocket-servlet to make it more friendly for WebAppClassloader	2012-11-12 19:42:32 -07:00
Jan Bartel	6b04056371	Merge remote-tracking branch 'origin/jetty-8' ... 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-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-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-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java 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	2012-11-06 16:12:00 +11:00
Jan Bartel	d4c4a7aee0	Merge remote-tracking branch 'origin/jetty-7' into jetty-8	2012-11-06 15:31:47 +11:00
Jan Bartel	fe09ca0e66	391623 Add option to --stop to wait for target jetty to stop	2012-11-06 14:35:37 +11: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	e076e8a8f0	393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls	2012-11-02 13:19:07 +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	13f6940fc3	393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls	2012-11-02 13:16:53 +11:00
Joakim Erdfelt	b6cca66914	Fixing compile issue. File.getName(Locale) is not allowed.	2012-11-01 19:12:36 -07:00
Greg Wilkins	65202e9abe	393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls	2012-11-02 11:55:00 +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	e4069c6939	392237 improved configuration defaults to match documentation	2012-10-22 17:48:41 +11:00
Greg Wilkins	9a1972e142	Merge remote-tracking branch 'origin/jetty-8'	2012-10-22 15:17:45 +11:00
Jan Bartel	e8a77e7fce	Merge remote-tracking branch 'origin/jetty-7' into jetty-8	2012-10-21 20:20:04 +11:00
Jan Bartel	63ec4e4a39	392525 Add option to --stop-wait to specify timeout	2012-10-21 20:18:45 +11:00
Greg Wilkins	2b13648b0e	392237 fixed many TODOs and many minor code cleanups	2012-10-19 16:17:30 +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	7625f0b8b3	Merge remote-tracking branch 'origin/master' into jetty-8	2012-10-11 16:34:16 +11:00
Jan Bartel	86b51e608f	391623 Add option to --stop to wait for target jetty to stop	2012-10-11 13:40:33 +11:00
Greg Wilkins	68ee346b8a	jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle	2012-09-21 11:45:51 +10:00
Jan Bartel	de17f8ec45	Merge remote-tracking branch 'origin/master' into jetty-8	2012-09-20 17:03:21 +10:00
Jan Bartel	1c5d007384	389965 OPTIONS should allow spaces in comma separated list	2012-09-20 17:02:18 +10:00
Greg Wilkins	2dfcebfc04	jetty-9 distribution working	2012-09-06 14:54:55 +10:00
Simone Bordet	06b2de17d5	Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http	2012-08-24 11:52:29 +02:00
Jesse McConnell	fd1ab0ed55	merge from master	2012-08-23 16:44:30 -05:00
Thomas Becker	2bd6cf2ebf	Merge branch 'master' of ssh://git.eclipse.org:29418/jetty/org.eclipse.jetty.project	2012-08-21 11:19:02 +02:00
Thomas Becker	1721a56c6d	369349: directory with spaces --dry-run fix	2012-08-20 19:16:03 +02:00
Jesse McConnell	f137b5fc38	add space between license and header	2012-08-20 08:33:06 -05: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
Jan Bartel	ab8e8578f8	Merge remote-tracking branch 'origin/master' into jetty-8	2012-07-23 15:35:01 +10:00
Jan Bartel	884aee31c0	385651 Message 'Address already in use' not specific enough	2012-07-23 15:29:39 +10: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	a7b1dd5e93	Merge remote-tracking branch 'origin/master' into jetty-8	2012-06-07 00:59:37 +02:00
Jan Bartel	65ee9d0d34	381876 Monitor should wait for child to finish before exiting.	2012-06-07 00:05:04 +02:00
Jan Bartel	9149a69446	Merge remote-tracking branch 'origin/master' into jetty-8	2012-06-04 13:49:25 +02:00
Jan Bartel	1f0e25ffa0	Merge "381220: start.log rollover"	2012-06-02 03:57:33 -04:00
Jan Bartel	9d7fc6975b	381401 Print log warning when stop attempt made with incorrect STOP.KEY	2012-06-01 20:01:44 +02:00
Thomas Becker	641fa869fa	381220: start.log rollover	2012-06-01 16:42:02 +02:00
Jan Bartel	34954bc617	Merge remote-tracking branch 'origin/master' into jetty-8	2012-05-22 17:28:40 +02:00
Thomas Becker	d7fec35028	379116: start.jar fix to shutdown child processes with --exec. Remove finally block and replace with a shutdown hook in _exec if branch. ... Change-Id: I85af53090a2797f433aca22276b413762999a477	2012-05-10 17:04:47 +02:00
Jan Bartel	17269583fb	Merge remote-tracking branch 'origin/master' into jetty-8	2012-03-30 12:05:46 +11:00
Jan Bartel	22f437c36d	375490 NPE with --help on command line	2012-03-28 14:47:27 +11:00
Jan Bartel	64e526dad4	Remove duplicate websocket entry in start.config	2012-03-15 10:47:16 +11:00
Jan Bartel	c7b42cdb06	Merge remote-tracking branch 'origin/master' into jetty-8	2012-02-29 20:07:33 +11:00
Jan Bartel	c95da2aa18	372806 Command line should accept relative paths for xml config files	2012-02-29 18:09:29 +11:00
Jesse McConnell	6b079ae3d8	merge from master	2012-02-01 17:25:08 -06:00