Commit Graph

317 Commits

Author SHA1 Message Date
Jesse McConnell 952d6b7316 [Bug 394144] add jetty-jaspi 2012-11-12 17:05:50 -06:00
Greg Wilkins 9d62229dec Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.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/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
2012-10-15 12:15:44 +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 785e06d347 390108 Servlet 3.0 API for programmatic login doesn't appear to work 2012-10-12 19:00:28 +11:00
Jan Bartel 286df12f03 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2012-09-28 19:27:07 +10:00
Jan Bartel f3e151467d 390161 Apply DeferredAuthentication fix to jaspi 2012-09-28 18:34:00 +10:00
Joakim Erdfelt 857498b115 Upgrading to junit-dep-4.10.jar (banning junit.jar) 2012-09-20 11:52:59 -07: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
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
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
Greg Wilkins b1750c0aae jetty-9 fixed bad merge of poms 2012-07-20 15:20: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 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
Jesse McConnell d292c67b7d [maven-release-plugin] prepare for next development iteration 2012-04-16 09:37:37 -05:00
Jesse McConnell eabdb734ef [maven-release-plugin] prepare release jetty-8.1.3.v20120416 2012-04-16 09:37:31 -05:00
Jesse McConnell 10e269ad68 [maven-release-plugin] prepare for next development iteration 2012-04-16 09:37:15 -05:00
Jesse McConnell df1f709ea2 [maven-release-plugin] prepare release jetty-7.6.3.v20120416 2012-04-16 09:37:08 -05:00
Jesse McConnell b64909900c [maven-release-plugin] prepare for next development iteration 2012-04-13 15:31:47 -05:00