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
..
src	Merge remote-tracking branch 'origin/jetty-8'	2012-11-02 14:08:05 +11:00
pom.xml	392237 Make rfc2616 webapp work in jetty-9	2012-10-29 15:53:51 +11:00