[jetty9] 87/99: Merge tag 'upstream/9.2.13'

Jakub Adam xhaakon-guest at moszumanska.debian.org
Fri Oct 9 21:20:55 UTC 2015


This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository jetty9.

commit 0737b8f40d461a3728115a8670a8fd9d760b2f13
Merge: 3af7ebf 0a3240c
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Aug 4 23:15:17 2015 +0200

    Merge tag 'upstream/9.2.13'
    
    Upstream version 9.2.13

 .gitattributes                                     |    4 +
 .gitignore                                         |   23 +-
 .travis.yml                                        |    4 -
 BUILDING.txt                                       |    9 -
 LICENSE-APACHE-2.0.txt                             |  202 -
 LICENSE-ECLIPSE-1.0.html                           |  320 --
 LICENSE-eplv10-aslv20.html                         |  576 ++
 NOTICE.txt                                         |   61 +-
 README.TXT                                         |   21 +
 README.md                                          |   24 +
 README.txt                                         |   22 -
 VERSION.txt                                        | 5523 +++++++++++++-------
 .../2015-02-24-httpparser-error-buffer-bleed.md    |  125 +
 aggregates/jetty-all/pom.xml                       |  230 +
 aggregates/jetty-websocket-all/pom.xml             |  163 +
 apache-jsp/pom.xml                                 |  120 +
 .../main/config/modules/jsp-impl/apache-jsp.mod    |   10 +
 .../jetty/apache/jsp/JettyJasperInitializer.java   |  119 +
 .../java/org/eclipse/jetty/apache/jsp/JuliLog.java |  188 +
 .../org/eclipse/jetty/jsp/JettyJspServlet.java     |  111 +
 .../javax.servlet.ServletContainerInitializer      |    1 +
 .../META-INF/services/org.apache.juli.logging.Log  |    1 +
 apache-jstl/pom.xml                                |   49 +
 .../main/config/modules/jsp-impl/apache-jstl.mod   |    8 +
 apache-jstl/src/main/resources/readme.txt          |    4 +
 dists/jetty-deb/pom.xml                            |  103 +
 dists/jetty-deb/src/main/unix/scripts/postinst     |   20 +
 dists/jetty-deb/src/main/unix/scripts/postrm       |   48 +
 dists/jetty-deb/src/main/unix/scripts/preinst      |   61 +
 dists/pom.xml                                      |   26 +
 eclipse-jetty-templates.xml                        |    8 -
 example-async-rest/async-rest-jar/pom.xml          |   24 -
 .../example/asyncrest/AbstractRestServlet.java     |  120 -
 .../jetty/example/asyncrest/AsyncRestServlet.java  |  211 -
 .../jetty/example/asyncrest/SerialRestServlet.java |  106 -
 .../src/main/resources/META-INF/web-fragment.xml   |   22 -
 example-async-rest/async-rest-webapp/pom.xml       |   34 -
 .../src/main/webapp/WEB-INF/web.xml                |    9 -
 .../async-rest-webapp/src/main/webapp/index.html   |   38 -
 .../jetty/example/asyncrest/DemoServer.java        |   48 -
 example-async-rest/pom.xml                         |   17 -
 example-jetty-embedded/pom.xml                     |   70 -
 .../org/eclipse/jetty/embedded/DumpServlet.java    |   53 -
 .../org/eclipse/jetty/embedded/FileServer.java     |   63 -
 .../org/eclipse/jetty/embedded/FileServerXml.java  |   44 -
 .../org/eclipse/jetty/embedded/HelloHandler.java   |   63 -
 .../org/eclipse/jetty/embedded/HelloServlet.java   |   49 -
 .../org/eclipse/jetty/embedded/LikeJettyXml.java   |  170 -
 .../org/eclipse/jetty/embedded/ManyConnectors.java |   67 -
 .../org/eclipse/jetty/embedded/ManyContexts.java   |   77 -
 .../org/eclipse/jetty/embedded/ManyHandlers.java   |  124 -
 .../jetty/embedded/ManyServletContexts.java        |   61 -
 .../eclipse/jetty/embedded/MinimalServlets.java    |   62 -
 .../org/eclipse/jetty/embedded/OneContext.java     |   48 -
 .../org/eclipse/jetty/embedded/OneHandler.java     |   33 -
 .../eclipse/jetty/embedded/OneServletContext.java  |   48 -
 .../java/org/eclipse/jetty/embedded/OneWebApp.java |   64 -
 .../org/eclipse/jetty/embedded/ProxyServer.java    |   58 -
 .../jetty/embedded/SecuredHelloHandler.java        |   70 -
 .../org/eclipse/jetty/embedded/SimplestServer.java |   34 -
 .../src/main/resources/fileserver.xml              |   35 -
 .../eclipse/jetty/embedded/GzipHandlerTest.java    |  131 -
 .../src/test/resources/realm.properties            |   22 -
 examples/async-rest/async-rest-jar/pom.xml         |   30 +
 .../example/asyncrest/AbstractRestServlet.java     |  129 +
 .../jetty/example/asyncrest/AsyncRestServlet.java  |  206 +
 .../jetty/example/asyncrest/SerialRestServlet.java |  106 +
 .../resources/META-INF/resources/asyncrest.html    |    0
 .../META-INF/resources/asyncrest/green.png         |  Bin
 .../resources/META-INF/resources/asyncrest/red.png |  Bin
 .../src/main/resources/META-INF/web-fragment.xml   |   28 +
 examples/async-rest/async-rest-webapp/pom.xml      |   33 +
 .../src/main/webapp/META-INF/MANIFEST.MF           |    0
 .../src/main/webapp/WEB-INF/jetty-web.xml          |   15 +
 .../src/main/webapp/WEB-INF/web.xml                |    9 +
 .../async-rest-webapp/src/main/webapp/index.html   |   44 +
 .../jetty/example/asyncrest/DemoServer.java        |   43 +
 examples/async-rest/pom.xml                        |   17 +
 examples/embedded/pom.xml                          |  109 +
 .../embedded}/prodDb.properties                    |    0
 .../embedded}/prodDb.script                        |    0
 examples/embedded/src/main/java/HelloWorld.java    |   59 +
 .../eclipse/jetty/embedded/AsyncEchoServlet.java   |  107 +
 .../org/eclipse/jetty/embedded/DumpServlet.java    |   59 +
 .../org/eclipse/jetty/embedded/ExampleServer.java  |   51 +
 .../eclipse/jetty/embedded/ExampleServerXml.java   |   40 +
 .../org/eclipse/jetty/embedded/FastFileServer.java |  194 +
 .../org/eclipse/jetty/embedded/FileServer.java     |   59 +
 .../org/eclipse/jetty/embedded/FileServerXml.java  |   48 +
 .../org/eclipse/jetty/embedded/HelloHandler.java   |   71 +
 .../org/eclipse/jetty/embedded/HelloServlet.java   |   53 +
 .../java/org/eclipse/jetty/embedded/JarServer.java |   51 +
 .../org/eclipse/jetty/embedded/LikeJettyXml.java   |  221 +
 .../org/eclipse/jetty/embedded/ManyConnectors.java |  127 +
 .../org/eclipse/jetty/embedded/ManyContexts.java   |   55 +
 .../org/eclipse/jetty/embedded/ManyHandlers.java   |  150 +
 .../jetty/embedded/ManyServletContexts.java        |   63 +
 .../eclipse/jetty/embedded/MinimalServlets.java    |   78 +
 .../org/eclipse/jetty/embedded/OneConnector.java   |   50 +
 .../org/eclipse/jetty/embedded/OneContext.java     |   43 +
 .../org/eclipse/jetty/embedded/OneHandler.java     |   33 +
 .../eclipse/jetty/embedded/OneServletContext.java  |   45 +
 .../jetty/embedded/OneServletContextJmxStats.java  |   52 +
 .../java/org/eclipse/jetty/embedded/OneWebApp.java |   82 +
 .../eclipse/jetty/embedded/OneWebAppWithJsp.java   |  109 +
 .../org/eclipse/jetty/embedded/ProxyServer.java    |   51 +
 .../jetty/embedded/SecuredHelloHandler.java        |  104 +
 .../jetty/embedded/ServerWithAnnotations.java      |   82 +
 .../org/eclipse/jetty/embedded/ServerWithJMX.java  |   56 +
 .../org/eclipse/jetty/embedded/ServerWithJNDI.java |  116 +
 .../org/eclipse/jetty/embedded/SimplestServer.java |   35 +
 .../org/eclipse/jetty/embedded/SpdyConnector.java  |  114 +
 .../org/eclipse/jetty/embedded/SpdyServer.java     |  210 +
 .../eclipse/jetty/embedded/SplitFileServer.java    |   93 +
 .../eclipse/jetty/embedded/WebSocketJsrServer.java |   68 +
 .../eclipse/jetty/embedded/WebSocketServer.java    |   80 +
 examples/embedded/src/main/resources/content.jar   |  Bin 0 -> 767 bytes
 .../embedded/src/main/resources/exampleserver.xml  |   39 +
 .../embedded/src/main/resources/fileserver.xml     |   36 +
 .../src/main/resources/jetty-logging.properties    |   12 +
 .../src/main/resources/jetty-otherserver.xml       |   51 +
 .../eclipse/jetty/embedded/GzipHandlerTest.java    |  125 +
 .../java/org/eclipse/jetty/embedded/TestXml.java   |   36 +
 .../embedded/src/test/resources/dir0/test0.txt     |    1 +
 .../embedded/src/test/resources/dir1/test1.txt     |    1 +
 .../embedded/src/test/resources/realm.properties   |   21 +
 examples/pom.xml                                   |   51 +
 jetty-aggregate/jetty-all-server/pom.xml           |  213 -
 jetty-aggregate/jetty-all/pom.xml                  |  176 -
 jetty-aggregate/jetty-client/pom.xml               |   87 -
 jetty-aggregate/jetty-plus/pom.xml                 |   91 -
 jetty-aggregate/jetty-server/pom.xml               |   97 -
 jetty-aggregate/jetty-servlet/pom.xml              |   96 -
 jetty-aggregate/jetty-webapp/pom.xml               |  103 -
 jetty-aggregate/jetty-websocket/pom.xml            |   91 -
 jetty-aggregate/pom.xml                            |   44 -
 jetty-ajp/pom.xml                                  |   83 -
 jetty-ajp/src/main/config/etc/jetty-ajp.xml        |   18 -
 .../org/eclipse/jetty/ajp/Ajp13Connection.java     |  250 -
 .../java/org/eclipse/jetty/ajp/Ajp13Generator.java |  782 ---
 .../java/org/eclipse/jetty/ajp/Ajp13Packet.java    |   68 -
 .../org/eclipse/jetty/ajp/Ajp13PacketMethods.java  |   74 -
 .../java/org/eclipse/jetty/ajp/Ajp13Parser.java    |  890 ----
 .../java/org/eclipse/jetty/ajp/Ajp13Request.java   |  124 -
 .../org/eclipse/jetty/ajp/Ajp13RequestHeaders.java |   67 -
 .../org/eclipse/jetty/ajp/Ajp13RequestPacket.java  |   90 -
 .../eclipse/jetty/ajp/Ajp13ResponseHeaders.java    |   48 -
 .../eclipse/jetty/ajp/Ajp13SocketConnector.java    |  132 -
 .../org/eclipse/jetty/ajp/Ajp13ConnectionTest.java |  331 --
 .../java/org/eclipse/jetty/ajp/TestAjpParser.java  |  608 ---
 jetty-alpn/jetty-alpn-client/pom.xml               |   76 +
 .../jetty/alpn/client/ALPNClientConnection.java    |   81 +
 .../alpn/client/ALPNClientConnectionFactory.java   |   51 +
 jetty-alpn/jetty-alpn-server/pom.xml               |   94 +
 .../src/main/config/etc/protonego-alpn.xml         |   19 +
 .../modules/protonego-impl/alpn-1.7.0_40.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_45.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_51.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_55.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_60.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_65.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_67.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_71.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_72.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_75.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_76.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_79.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_80.mod       |    8 +
 .../config/modules/protonego-impl/alpn-1.8.0.mod   |    8 +
 .../modules/protonego-impl/alpn-1.8.0_05.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_11.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_20.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_25.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_31.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_40.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_45.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_51.mod       |    8 +
 .../main/config/modules/protonego-impl/alpn.mod    |   42 +
 .../jetty/alpn/server/ALPNServerConnection.java    |   82 +
 .../alpn/server/ALPNServerConnectionFactory.java   |   61 +
 jetty-alpn/pom.xml                                 |   17 +
 jetty-annotations/pom.xml                          |   22 +-
 .../src/main/config/etc/jetty-annotations.xml      |   27 +-
 .../src/main/config/modules/annotations.mod        |   17 +
 .../AbstractDiscoverableAnnotationHandler.java     |   49 +-
 .../jetty/annotations/AnnotationConfiguration.java | 1065 +++-
 .../jetty/annotations/AnnotationDecorator.java     |  126 +-
 .../jetty/annotations/AnnotationParser.java        | 1159 ++--
 .../jetty/annotations/ClassInheritanceHandler.java |   56 +-
 .../ContainerInitializerAnnotationHandler.java     |   72 +-
 .../annotations/DeclareRolesAnnotationHandler.java |   12 +-
 .../MultiPartConfigAnnotationHandler.java          |    2 +-
 .../PostConstructAnnotationHandler.java            |   12 +-
 .../annotations/PreDestroyAnnotationHandler.java   |   16 +-
 .../annotations/ResourceAnnotationHandler.java     |   82 +-
 .../jetty/annotations/RunAsAnnotationHandler.java  |   17 +-
 .../ServletContainerInitializerListener.java       |  144 -
 .../ServletContainerInitializersStarter.java       |   76 +
 .../ServletSecurityAnnotationHandler.java          |   57 +-
 .../java/org/eclipse/jetty/annotations/Util.java   |   38 +
 .../jetty/annotations/WebFilterAnnotation.java     |   58 +-
 .../annotations/WebFilterAnnotationHandler.java    |   48 +-
 .../jetty/annotations/WebListenerAnnotation.java   |   29 +-
 .../annotations/WebListenerAnnotationHandler.java  |   44 +-
 .../jetty/annotations/WebServletAnnotation.java    |   85 +-
 .../annotations/WebServletAnnotationHandler.java   |   61 +-
 .../eclipse/jetty/annotations/package-info.java    |   23 +
 .../org/eclipse/jetty/annotations/FilterC.java     |   12 +-
 .../org/eclipse/jetty/annotations/ServletC.java    |   10 +-
 .../annotations/TestAnnotationConfiguration.java   |   13 +-
 .../annotations/TestAnnotationInheritance.java     |   96 +-
 .../jetty/annotations/TestAnnotationParser.java    |  193 +-
 .../TestSecurityAnnotationConversions.java         |  187 +-
 .../jetty/annotations/TestServletAnnotations.java  |   67 +-
 .../jetty/annotations/resources/ResourceA.java     |   35 +-
 .../resources/TestResourceAnnotations.java         |    7 +-
 jetty-ant/pom.xml                                  |   72 +
 .../org/eclipse/jetty/ant/AntWebAppContext.java    |  766 +++
 .../eclipse/jetty/ant/AntWebInfConfiguration.java  |  170 +
 .../eclipse/jetty/ant/AntWebXmlConfiguration.java  |   65 +
 .../java/org/eclipse/jetty/ant/JettyRunTask.java   |  327 ++
 .../java/org/eclipse/jetty/ant/JettyStopTask.java  |  127 +
 .../org/eclipse/jetty/ant/ServerProxyImpl.java     |  514 ++
 .../java/org/eclipse/jetty/ant/package-info.java   |   23 +
 .../org/eclipse/jetty/ant/types/Attribute.java     |   47 +
 .../org/eclipse/jetty/ant/types/Attributes.java    |   38 +
 .../org/eclipse/jetty/ant/types/Connector.java     |   62 +
 .../org/eclipse/jetty/ant/types/Connectors.java    |   86 +
 .../eclipse/jetty/ant/types/ContextHandlers.java   |   45 +
 .../jetty/ant/types/FileMatchingConfiguration.java |   98 +
 .../org/eclipse/jetty/ant/types/LoginServices.java |   47 +
 .../eclipse/jetty/ant/types/SystemProperties.java  |   67 +
 .../org/eclipse/jetty/ant/types/package-info.java  |   23 +
 .../org/eclipse/jetty/ant/utils/ServerProxy.java   |   42 +
 .../java/org/eclipse/jetty/ant/utils/TaskLog.java  |   58 +
 .../org/eclipse/jetty/ant/utils/package-info.java  |   23 +
 jetty-ant/src/main/resources/tasks.properties      |    2 +
 jetty-ant/src/test/config/build.xml                |   42 +
 .../test/java/org/eclipse/jetty/ant/AntBuild.java  |  294 ++
 .../org/eclipse/jetty/ant/JettyAntTaskTest.java    |   72 +
 jetty-ant/src/test/resources/connector-test.xml    |   19 +
 .../src/test/resources/foo/WEB-INF/acme-taglib.tld |   28 +
 .../test/resources/foo}/WEB-INF/acme-taglib2.tld   |    0
 .../src/test/resources/foo}/WEB-INF/tags/panel.tag |    0
 jetty-ant/src/test/resources/foo/WEB-INF/web.xml   |   28 +
 jetty-ant/src/test/resources/foo/index.html        |    5 +
 .../src/test/resources/foo}/jsp/bean1.jsp          |    0
 .../src/test/resources/foo}/jsp/bean2.jsp          |    0
 .../src/test/resources/foo/jsp}/dump.jsp           |    0
 .../src/test/resources/foo}/jsp/expr.jsp           |    0
 .../src/test/resources/foo}/jsp/foo/foo.jsp        |    0
 .../src/test/resources/foo}/jsp/index.html         |    0
 .../src/test/resources/foo}/jsp/jstl.jsp           |    0
 .../src/test/resources/foo}/jsp/tag.jsp            |    0
 .../src/test/resources/foo}/jsp/tag2.jsp           |    0
 .../src/test/resources/foo}/jsp/tagfile.jsp        |    0
 jetty-ant/src/test/resources/webapp-test.xml       |   17 +
 jetty-cdi/pom.xml                                  |   49 +
 jetty-cdi/src/main/config/etc/jetty-cdi.xml        |   19 +
 jetty-cdi/src/main/config/modules/cdi.mod          |   26 +
 .../eclipse/jetty/cdi/WeldDeploymentBinding.java   |   77 +
 jetty-client/pom.xml                               |  239 +-
 jetty-client/src/main/config/modules/client.mod    |    6 +
 .../jetty/client/AbstractHttpClientTransport.java  |  172 +
 .../jetty/client/AbstractHttpConnection.java       |  571 --
 .../java/org/eclipse/jetty/client/Address.java     |   96 -
 .../eclipse/jetty/client/AsyncContentProvider.java |   45 +
 .../eclipse/jetty/client/AsyncHttpConnection.java  |  269 -
 .../client/AuthenticationProtocolHandler.java      |  195 +
 .../jetty/client/BlockingHttpConnection.java       |  314 --
 .../org/eclipse/jetty/client/CachedExchange.java   |   75 -
 .../org/eclipse/jetty/client/ConnectionPool.java   |  410 ++
 .../org/eclipse/jetty/client/ContentDecoder.java   |   86 +
 .../org/eclipse/jetty/client/ContentExchange.java  |  135 -
 .../jetty/client/ContinueProtocolHandler.java      |  120 +
 .../eclipse/jetty/client/GZIPContentDecoder.java   |  359 ++
 .../jetty/client/HttpAuthenticationStore.java      |   93 +
 .../java/org/eclipse/jetty/client/HttpChannel.java |  142 +
 .../java/org/eclipse/jetty/client/HttpClient.java  | 1379 ++---
 .../eclipse/jetty/client/HttpClientTransport.java  |   71 +
 .../org/eclipse/jetty/client/HttpConnection.java   |  175 +
 .../java/org/eclipse/jetty/client/HttpContent.java |  217 +
 .../eclipse/jetty/client/HttpContentResponse.java  |  138 +
 .../org/eclipse/jetty/client/HttpConversation.java |  149 +
 .../org/eclipse/jetty/client/HttpDestination.java  |  781 +--
 .../eclipse/jetty/client/HttpEventListener.java    |   68 -
 .../jetty/client/HttpEventListenerWrapper.java     |  167 -
 .../org/eclipse/jetty/client/HttpExchange.java     | 1358 +----
 .../java/org/eclipse/jetty/client/HttpProxy.java   |  205 +
 .../org/eclipse/jetty/client/HttpReceiver.java     |  583 +++
 .../org/eclipse/jetty/client/HttpRedirector.java   |  335 ++
 .../java/org/eclipse/jetty/client/HttpRequest.java |  815 +++
 .../eclipse/jetty/client/HttpRequestException.java |   37 +
 .../org/eclipse/jetty/client/HttpResponse.java     |  111 +
 .../jetty/client/HttpResponseException.java        |   37 +
 .../java/org/eclipse/jetty/client/HttpSender.java  |  908 ++++
 .../jetty/client/LeakTrackingConnectionPool.java   |   92 +
 .../jetty/client/MultiplexHttpDestination.java     |  166 +
 .../main/java/org/eclipse/jetty/client/Origin.java |  124 +
 .../jetty/client/PoolingHttpDestination.java       |  235 +
 .../org/eclipse/jetty/client/ProtocolHandler.java  |   29 +
 .../client/ProxyAuthenticationProtocolHandler.java |   65 +
 .../eclipse/jetty/client/ProxyConfiguration.java   |  170 +
 .../org/eclipse/jetty/client/RedirectListener.java |  212 -
 .../jetty/client/RedirectProtocolHandler.java      |   56 +
 .../org/eclipse/jetty/client/RequestNotifier.java  |  260 +
 .../org/eclipse/jetty/client/ResponseNotifier.java |  291 ++
 .../org/eclipse/jetty/client/SelectConnector.java  |  449 --
 .../org/eclipse/jetty/client/SocketConnector.java  |  110 -
 .../java/org/eclipse/jetty/client/Socks4Proxy.java |  241 +
 .../org/eclipse/jetty/client/Synchronizable.java   |   45 +
 .../jetty/client/TimeoutCompleteListener.java      |   84 +
 .../client/WWWAuthenticationProtocolHandler.java   |   63 +
 .../eclipse/jetty/client/api/Authentication.java   |  138 +
 .../jetty/client/api/AuthenticationStore.java      |   78 +
 .../org/eclipse/jetty/client/api/Connection.java   |   46 +
 .../eclipse/jetty/client/api/ContentProvider.java  |   54 +
 .../eclipse/jetty/client/api/ContentResponse.java  |   46 +
 .../org/eclipse/jetty/client/api/Destination.java  |   64 +
 .../java/org/eclipse/jetty/client/api/Request.java |  574 ++
 .../org/eclipse/jetty/client/api/Response.java     |  270 +
 .../java/org/eclipse/jetty/client/api/Result.java  |  120 +
 .../org/eclipse/jetty/client/api/package-info.java |   23 +
 .../jetty/client/http/HttpChannelOverHTTP.java     |  129 +
 .../client/http/HttpClientTransportOverHTTP.java   |   65 +
 .../jetty/client/http/HttpConnectionOverHTTP.java  |  221 +
 .../jetty/client/http/HttpDestinationOverHTTP.java |   38 +
 .../jetty/client/http/HttpReceiverOverHTTP.java    |  317 ++
 .../jetty/client/http/HttpSenderOverHTTP.java      |  250 +
 .../org/eclipse/jetty/client/package-info.java     |   51 +
 .../jetty/client/security/Authentication.java      |   33 -
 .../jetty/client/security/BasicAuthentication.java |   57 -
 .../client/security/DigestAuthentication.java      |  141 -
 .../jetty/client/security/HashRealmResolver.java   |   45 -
 .../jetty/client/security/ProxyAuthorization.java  |   57 -
 .../org/eclipse/jetty/client/security/Realm.java   |   32 -
 .../jetty/client/security/RealmResolver.java       |   28 -
 .../jetty/client/security/SecurityListener.java    |  276 -
 .../jetty/client/security/SimpleRealmResolver.java |   44 -
 .../client/util/AbstractTypedContentProvider.java  |   37 +
 .../jetty/client/util/BasicAuthentication.java     |  109 +
 .../client/util/BufferingResponseListener.java     |  192 +
 .../client/util/ByteBufferContentProvider.java     |   94 +
 .../jetty/client/util/BytesContentProvider.java    |   87 +
 .../jetty/client/util/DeferredContentProvider.java |  341 ++
 .../jetty/client/util/DigestAuthentication.java    |  282 +
 .../jetty/client/util/FormContentProvider.java     |   77 +
 .../jetty/client/util/FutureResponseListener.java  |  121 +
 .../client/util/InputStreamContentProvider.java    |  263 +
 .../client/util/InputStreamResponseListener.java   |  349 ++
 .../client/util/OutputStreamContentProvider.java   |  154 +
 .../jetty/client/util/PathContentProvider.java     |  161 +
 .../jetty/client/util/StringContentProvider.java   |   51 +
 .../eclipse/jetty/client/util/package-info.java    |   23 +
 .../eclipse/jetty/client/webdav/MkcolExchange.java |   64 -
 .../jetty/client/webdav/PropfindExchange.java      |   57 -
 .../jetty/client/webdav/WebdavListener.java        |  332 --
 .../client/webdav/WebdavSupportedExchange.java     |   75 -
 .../jetty/client/AbstractConnectionTest.java       |  443 --
 .../jetty/client/AbstractHttpClientServerTest.java |  104 +
 .../client/AbstractHttpExchangeCancelTest.java     |  500 --
 .../client/AsyncCallbackHttpExchangeTest.java      |  110 -
 .../jetty/client/AsyncSelectConnectionTest.java    |   73 -
 .../jetty/client/AsyncSslHttpExchangeTest.java     |   53 -
 .../jetty/client/AsyncSslSecurityListenerTest.java |   36 -
 .../client/BlockingHttpExchangeCancelTest.java     |   60 -
 .../jetty/client/CachedHeadersIsolationTest.java   |  140 -
 .../eclipse/jetty/client/ContentExchangeTest.java  |  389 --
 .../eclipse/jetty/client/ContentResponseTest.java  |  124 +
 .../test/java/org/eclipse/jetty/client/Curl.java   |  200 -
 .../eclipse/jetty/client/EmptyServerHandler.java   |   37 +
 .../org/eclipse/jetty/client/ErrorStatusTest.java  |  276 -
 .../ExpirationWithLimitedConnectionsTest.java      |  197 -
 .../java/org/eclipse/jetty/client/ExpireTest.java  |  159 -
 .../ExternalKeyStoreAsyncSslHttpExchangeTest.java  |   37 -
 .../org/eclipse/jetty/client/ExternalSiteTest.java |  157 +-
 .../jetty/client/GZIPContentDecoderTest.java       |  292 ++
 .../jetty/client/HostnameVerificationTest.java     |  172 +
 .../eclipse/jetty/client/Http100ContinueTest.java  |  245 -
 .../java/org/eclipse/jetty/client/HttpAsserts.java |   47 -
 .../jetty/client/HttpClientAsyncContentTest.java   |  118 +
 .../jetty/client/HttpClientAuthenticationTest.java |  323 ++
 .../jetty/client/HttpClientChunkedContentTest.java |  216 +
 .../jetty/client/HttpClientContinueTest.java       |  724 +++
 .../jetty/client/HttpClientCustomProxyTest.java    |  246 +
 .../eclipse/jetty/client/HttpClientDuplexTest.java |  385 --
 .../client/HttpClientExplicitConnectionTest.java   |  101 +
 .../jetty/client/HttpClientFailureTest.java        |  270 +
 .../eclipse/jetty/client/HttpClientGZIPTest.java   |  209 +
 .../eclipse/jetty/client/HttpClientLoadTest.java   |  317 ++
 .../eclipse/jetty/client/HttpClientProxyTest.java  |  160 +
 .../jetty/client/HttpClientRedirectTest.java       |  490 ++
 .../eclipse/jetty/client/HttpClientStreamTest.java | 1127 ++++
 .../client/HttpClientSynchronizationTest.java      |  108 +
 .../org/eclipse/jetty/client/HttpClientTest.java   | 1487 ++++++
 .../jetty/client/HttpClientTimeoutTest.java        |  509 ++
 .../eclipse/jetty/client/HttpClientURITest.java    |  474 ++
 .../HttpClientUploadDuringServerShutdown.java      |  277 +
 .../jetty/client/HttpConnectionLifecycleTest.java  |  528 ++
 .../org/eclipse/jetty/client/HttpCookieTest.java   |  154 +
 .../jetty/client/HttpDestinationQueueTest.java     |  225 -
 .../org/eclipse/jetty/client/HttpExchangeTest.java |  695 ---
 .../eclipse/jetty/client/HttpGetRedirectTest.java  |  237 -
 .../org/eclipse/jetty/client/HttpHeadersTest.java  |  193 -
 .../eclipse/jetty/client/HttpRequestAbortTest.java |  561 ++
 .../jetty/client/HttpResponseAbortTest.java        |  259 +
 .../client/HttpResponseConcurrentAbortTest.java    |  192 +
 .../jetty/client/HttpsProxyAuthenticationTest.java |  123 -
 .../jetty/client/HttpsViaBrokenHttpProxyTest.java  |  141 -
 .../org/eclipse/jetty/client/IdleTimeoutTest.java  |  147 -
 .../client/NonBlockingHttpExchangeCancelTest.java  |   64 -
 .../jetty/client/ProxyConfigurationTest.java       |   66 +
 .../eclipse/jetty/client/ProxyFakeTunnelTest.java  |  237 -
 .../eclipse/jetty/client/ProxyTunnellingTest.java  |  414 --
 .../jetty/client/SecuredContentExchangeTest.java   |  108 -
 .../jetty/client/SecuredErrorStatusTest.java       |  193 -
 .../eclipse/jetty/client/SecurityListenerTest.java |  355 --
 .../eclipse/jetty/client/SelectConnectionTest.java |   30 -
 .../test/java/org/eclipse/jetty/client/Siege.java  |  229 -
 .../eclipse/jetty/client/SluggishServerTest.java   |  264 -
 .../eclipse/jetty/client/SocketConnectionTest.java |  101 -
 .../org/eclipse/jetty/client/Socks4ProxyTest.java  |  182 +
 .../eclipse/jetty/client/SslBytesClientTest.java   |  166 -
 .../eclipse/jetty/client/SslBytesServerTest.java   | 1783 -------
 .../org/eclipse/jetty/client/SslBytesTest.java     |  371 --
 .../jetty/client/SslCertSecuredExchangeTest.java   |  174 -
 .../jetty/client/SslContentExchangeTest.java       |   74 -
 .../eclipse/jetty/client/SslHttpExchangeTest.java  |  110 -
 .../client/SslSecuredContentExchangeTest.java      |  114 -
 .../jetty/client/SslSecuredErrorStatusTest.java    |  191 -
 .../jetty/client/SslSecurityListenerTest.java      |  269 -
 .../client/SslSelectChannelValidationTest.java     |   30 -
 .../jetty/client/SslSocketValidationTest.java      |   30 -
 .../jetty/client/SslValidationTestBase.java        |  116 -
 .../eclipse/jetty/client/TimeoutExchangeTest.java  |  379 --
 .../java/org/eclipse/jetty/client/TimeoutTest.java |  438 --
 .../eclipse/jetty/client/UnexpectedDataTest.java   |  181 -
 .../eclipse/jetty/client/WebSocketUpgradeTest.java |  265 -
 .../eclipse/jetty/client/WebdavListenerTest.java   |  144 -
 .../java/org/eclipse/jetty/client/api/Usage.java   |  347 ++
 .../AbstractSslServerAndClientCreator.java         |   60 -
 .../AsyncSslServerAndClientCreator.java            |   42 -
 ...rnalKeyStoreAsyncSslServerAndClientCreator.java |   45 -
 .../client/helperClasses/GenericServerHandler.java |  109 -
 .../helperClasses/HttpServerAndClientCreator.java  |   54 -
 .../helperClasses/ServerAndClientCreator.java      |   29 -
 .../helperClasses/SslServerAndClientCreator.java   |   37 -
 .../client/http/HttpDestinationOverHTTPTest.java   |  275 +
 .../client/http/HttpReceiverOverHTTPTest.java      |  250 +
 .../jetty/client/http/HttpSenderOverHTTPTest.java  |  302 ++
 .../client/security/SecurityResolverTest.java      |   51 -
 .../jetty/client/ssl/SslBytesClientTest.java       |  366 ++
 .../jetty/client/ssl/SslBytesServerTest.java       | 1978 +++++++
 .../org/eclipse/jetty/client/ssl/SslBytesTest.java |  385 ++
 .../client/util/DeferredContentProviderTest.java   |  156 +
 .../util/InputStreamContentProviderTest.java       |  185 +
 .../client/util/TypedContentProviderTest.java      |  141 +
 jetty-client/src/test/resources/foo.txt            |    1 -
 .../src/test/resources/jetty-logging.properties    |    4 +-
 .../src/test}/resources/keystore.jks               |  Bin
 jetty-client/src/test/resources/realm.properties   |   25 +-
 .../src/test}/resources/truststore.jks             |  Bin
 jetty-continuation/pom.xml                         |   26 +-
 .../eclipse/jetty/continuation/Continuation.java   |    5 -
 .../jetty/continuation/ContinuationFilter.java     |   20 +-
 .../jetty/continuation/ContinuationListener.java   |   16 +-
 .../jetty/continuation/ContinuationSupport.java    |   49 +-
 .../jetty/continuation/FauxContinuation.java       |   99 +-
 .../jetty/continuation/Jetty6Continuation.java     |  267 -
 .../jetty/continuation/Servlet3Continuation.java   |  131 +-
 .../eclipse/jetty/continuation/package-info.java   |   23 +
 jetty-deploy/pom.xml                               |   11 +-
 .../src/main/config/etc/jetty-contexts.xml         |   23 -
 jetty-deploy/src/main/config/etc/jetty-deploy.xml  |   88 +-
 jetty-deploy/src/main/config/etc/jetty-webapps.xml |   26 -
 jetty-deploy/src/main/config/modules/deploy.mod    |   21 +
 .../main/java/org/eclipse/jetty/deploy/App.java    |    1 +
 .../java/org/eclipse/jetty/deploy/AppProvider.java |    2 -
 .../org/eclipse/jetty/deploy/ContextDeployer.java  |  473 --
 .../eclipse/jetty/deploy/DeploymentManager.java    |   40 +-
 .../jetty/deploy/FileConfigurationManager.java     |   75 -
 .../deploy/PropertiesConfigurationManager.java     |   92 +
 .../org/eclipse/jetty/deploy/WebAppDeployer.java   |  328 --
 .../deploy/bindings/GlobalWebappConfigBinding.java |   23 +-
 .../jetty/deploy/bindings/StandardStarter.java     |   12 +-
 .../jetty/deploy/bindings/StandardStopper.java     |   12 +-
 .../jetty/deploy/bindings/StandardUndeployer.java  |    2 +
 .../jetty/deploy/bindings/package-info.java        |   23 +
 .../eclipse/jetty/deploy/graph/package-info.java   |   23 +
 .../org/eclipse/jetty/deploy/jmx/package-info.java |   23 +
 .../org/eclipse/jetty/deploy/package-info.java     |   23 +
 .../jetty/deploy/providers/ContextProvider.java    |  150 -
 .../deploy/providers/ScanningAppProvider.java      |  100 +-
 .../jetty/deploy/providers/WebAppProvider.java     |  370 +-
 .../jetty/deploy/providers/package-info.java       |   23 +
 .../eclipse/jetty/deploy/util/package-info.java    |   23 +
 .../deploy/jmx/ContextDeployer-mbean.properties    |    9 -
 .../deploy/jmx/DeploymentManager-mbean.properties  |   10 -
 .../deploy/jmx/WebAppDeployer-mbean.properties     |   14 -
 .../providers/jmx/ContextProvider-mbean.properties |    1 -
 .../jmx/ScanningAppProvider-mbean.properties       |    4 -
 .../providers/jmx/WebAppProvider-mbean.properties  |    7 -
 .../org/eclipse/jetty/deploy/AppLifeCycleTest.java |    6 +-
 .../deploy/DeploymentManagerLifeCyclePathTest.java |   14 +-
 .../jetty/deploy/DeploymentManagerTest.java        |    9 +-
 .../eclipse/jetty/deploy/JmxServiceConnection.java |  154 +
 .../bindings/GlobalWebappConfigBindingTest.java    |   17 +-
 .../org/eclipse/jetty/deploy/graph/GraphTest.java  |   32 +-
 .../ScanningAppProviderRuntimeUpdatesTest.java     |   22 +-
 .../providers/ScanningAppProviderStartupTest.java  |    7 +-
 .../jetty/deploy/providers/WebAppProviderTest.java |   19 +-
 .../jetty/deploy/test/XmlConfiguredJetty.java      |  129 +-
 .../src/test/resources/binding-test-contexts-1.xml |   27 +-
 .../src/test/resources/context-binding-test-1.xml  |    4 +-
 jetty-deploy/src/test/resources/contexts/foo.xml   |    8 -
 jetty-deploy/src/test/resources/etc/webdefault.xml |    4 +-
 .../src/test/resources/jetty-deploy-wars.xml       |    8 +-
 .../test/resources/jetty-deploymgr-contexts.xml    |   41 +-
 jetty-deploy/src/test/resources/jetty-http.xml     |   41 +
 .../src/test/resources/jetty-logging.properties    |    3 +
 jetty-deploy/src/test/resources/jetty.xml          |  190 +-
 jetty-deploy/src/test/resources/webapps/foo.xml    |    8 +
 jetty-distribution/pom.xml                         |  651 ++-
 jetty-distribution/src/main/resources/README.TXT   |   68 +
 jetty-distribution/src/main/resources/README.txt   |   70 -
 .../main/resources/bin/README.jetty-cygwin.txt.txt |   11 -
 .../src/main/resources/bin/jetty-cygwin.sh         |  677 ---
 .../src/main/resources/bin/jetty-xinetd.sh         |   14 -
 jetty-distribution/src/main/resources/bin/jetty.sh |  354 +-
 .../main/resources/contexts-available/README.TXT   |    3 -
 .../resources/contexts-available/resources.xml     |   27 -
 .../src/main/resources/contexts/README.TXT         |   15 -
 .../src/main/resources/contexts/javadoc.xml        |   27 -
 .../src/main/resources/demo-base/etc/keystore      |  Bin 0 -> 1416 bytes
 .../main/resources/demo-base/webapps/README.TXT    |   12 +
 .../demo-base/webapps/ROOT/images/jetty-header.jpg |  Bin 0 -> 103289 bytes
 .../demo-base/webapps/ROOT/images/webtide_logo.jpg |  Bin 0 -> 17678 bytes
 .../resources/demo-base/webapps/ROOT/index.html    |   72 +
 .../resources/demo-base/webapps/ROOT/jetty.css     |  351 ++
 .../resources/demo-base/webapps/example-moved.xml  |   12 +
 .../src/main/resources/etc/hawtio.xml              |   16 +
 .../src/main/resources/etc/jamon.xml               |   32 +
 .../src/main/resources/etc/jetty-started.xml       |    2 +-
 .../src/main/resources/etc/jetty.conf              |    4 +-
 .../src/main/resources/etc/jminix.xml              |   12 +
 .../src/main/resources/etc/jolokia.xml             |   16 +
 .../resources/{webapps => modules}/.donotdelete    |    0
 .../src/main/resources/modules/hawtio.mod          |   28 +
 .../src/main/resources/modules/jamon.mod           |   30 +
 .../src/main/resources/modules/jminix.mod          |   41 +
 .../src/main/resources/modules/jolokia.mod         |   19 +
 .../src/main/resources/modules/jsp.mod             |   21 +
 .../src/main/resources/modules/jstl.mod            |   14 +
 .../src/main/resources/modules/protonego.mod       |   24 +
 .../src/main/resources/modules/setuid.mod          |   19 +
 jetty-distribution/src/main/resources/start.ini    |   80 +-
 .../src/main/resources/webapps/README.TXT          |   33 +
 jetty-fcgi/fcgi-client/pom.xml                     |   40 +
 .../src/main/java/org/eclipse/jetty/fcgi/FCGI.java |  136 +
 .../fcgi/client/http/HttpChannelOverFCGI.java      |  176 +
 .../client/http/HttpClientTransportOverFCGI.java   |   85 +
 .../fcgi/client/http/HttpConnectionOverFCGI.java   |  425 ++
 .../fcgi/client/http/HttpDestinationOverFCGI.java  |   38 +
 .../fcgi/client/http/HttpReceiverOverFCGI.java     |   71 +
 .../jetty/fcgi/client/http/HttpSenderOverFCGI.java |  128 +
 .../http/MultiplexHttpDestinationOverFCGI.java     |   38 +
 .../jetty/fcgi/generator/ClientGenerator.java      |  166 +
 .../org/eclipse/jetty/fcgi/generator/Flusher.java  |  143 +
 .../eclipse/jetty/fcgi/generator/Generator.java    |  155 +
 .../jetty/fcgi/generator/ServerGenerator.java      |  134 +
 .../fcgi/parser/BeginRequestContentParser.java     |  127 +
 .../eclipse/jetty/fcgi/parser/ClientParser.java    |  110 +
 .../eclipse/jetty/fcgi/parser/ContentParser.java   |   53 +
 .../jetty/fcgi/parser/EndRequestContentParser.java |  130 +
 .../eclipse/jetty/fcgi/parser/HeaderParser.java    |  158 +
 .../jetty/fcgi/parser/ParamsContentParser.java     |  259 +
 .../java/org/eclipse/jetty/fcgi/parser/Parser.java |  161 +
 .../jetty/fcgi/parser/ResponseContentParser.java   |  327 ++
 .../eclipse/jetty/fcgi/parser/ServerParser.java    |   54 +
 .../jetty/fcgi/parser/StreamContentParser.java     |  117 +
 .../jetty/fcgi/generator/ClientGeneratorTest.java  |  191 +
 .../jetty/fcgi/parser/ClientParserTest.java        |  255 +
 .../src/test/resources/jetty-logging.properties    |    3 +
 jetty-fcgi/fcgi-server/pom.xml                     |   73 +
 .../fcgi-server/src/main/config/modules/fcgi.mod   |   15 +
 .../jetty/fcgi/server/HttpChannelOverFCGI.java     |  206 +
 .../jetty/fcgi/server/HttpTransportOverFCGI.java   |  127 +
 .../jetty/fcgi/server/ServerFCGIConnection.java    |  196 +
 .../fcgi/server/ServerFCGIConnectionFactory.java   |   49 +
 .../fcgi/server/proxy/FastCGIProxyServlet.java     |  188 +
 .../jetty/fcgi/server/proxy/TryFilesFilter.java    |  141 +
 .../fcgi/server/AbstractHttpClientServerTest.java  |  123 +
 .../jetty/fcgi/server/EmptyServerHandler.java      |   36 +
 .../fcgi/server/ExternalFastCGIServerTest.java     |   55 +
 .../eclipse/jetty/fcgi/server/HttpClientTest.java  |  703 +++
 .../server/proxy/DrupalSPDYFastCGIProxyServer.java |   77 +
 .../fcgi/server/proxy/FastCGIProxyServletTest.java |  174 +
 .../fcgi/server/proxy/TryFilesFilterTest.java      |  107 +
 .../proxy/WordPressSPDYFastCGIProxyServer.java     |   85 +
 .../src/test/resources/jetty-logging.properties    |    3 +
 .../fcgi-server}/src/test/resources/keystore.jks   |  Bin
 .../fcgi-server}/src/test/resources/truststore.jks |  Bin
 jetty-fcgi/pom.xml                                 |   28 +
 jetty-http-spi/pom.xml                             |    6 +-
 .../jetty/http/spi/DelegatingThreadPool.java       |  139 +
 .../jetty/http/spi/HttpSpiContextHandler.java      |   23 +-
 .../eclipse/jetty/http/spi/JettyHttpContext.java   |    4 +-
 .../eclipse/jetty/http/spi/JettyHttpExchange.java  |   32 +-
 .../eclipse/jetty/http/spi/JettyHttpServer.java    |  534 +-
 .../jetty/http/spi/JettyHttpServerProvider.java    |   19 +-
 .../jetty/http/spi/ThreadPoolExecutorAdapter.java  |  124 -
 jetty-http/pom.xml                                 |   15 +-
 .../org/eclipse/jetty/http/AbstractGenerator.java  |  534 --
 .../java/org/eclipse/jetty/http/DateGenerator.java |  164 +
 .../java/org/eclipse/jetty/http/DateParser.java    |  109 +
 .../org/eclipse/jetty/http/EncodedHttpURI.java     |  183 -
 .../java/org/eclipse/jetty/http/Generator.java     |   96 -
 .../java/org/eclipse/jetty/http/HttpBuffers.java   |  108 -
 .../org/eclipse/jetty/http/HttpBuffersImpl.java    |  238 -
 .../java/org/eclipse/jetty/http/HttpContent.java   |  107 +-
 .../java/org/eclipse/jetty/http/HttpCookie.java    |  187 +-
 .../java/org/eclipse/jetty/http/HttpException.java |   94 -
 .../java/org/eclipse/jetty/http/HttpField.java     |   89 +
 .../java/org/eclipse/jetty/http/HttpFields.java    | 1238 ++---
 .../java/org/eclipse/jetty/http/HttpGenerator.java | 1734 +++---
 .../java/org/eclipse/jetty/http/HttpHeader.java    |  178 +
 .../org/eclipse/jetty/http/HttpHeaderValue.java    |  104 +
 .../org/eclipse/jetty/http/HttpHeaderValues.java   |   88 -
 .../java/org/eclipse/jetty/http/HttpHeaders.java   |  241 -
 .../java/org/eclipse/jetty/http/HttpMethod.java    |  187 +
 .../java/org/eclipse/jetty/http/HttpMethods.java   |   64 -
 .../java/org/eclipse/jetty/http/HttpParser.java    | 2393 +++++----
 .../java/org/eclipse/jetty/http/HttpScheme.java    |   79 +
 .../java/org/eclipse/jetty/http/HttpSchemes.java   |   38 -
 .../java/org/eclipse/jetty/http/HttpTester.java    |  367 ++
 .../java/org/eclipse/jetty/http/HttpTokens.java    |   14 +-
 .../main/java/org/eclipse/jetty/http/HttpURI.java  |  155 +-
 .../java/org/eclipse/jetty/http/HttpVersion.java   |  173 +
 .../java/org/eclipse/jetty/http/HttpVersions.java  |   47 -
 .../java/org/eclipse/jetty/http/MimeTypes.java     |  475 +-
 .../main/java/org/eclipse/jetty/http/Parser.java   |   47 -
 .../main/java/org/eclipse/jetty/http/PathMap.java  |  257 +-
 .../jetty/http/gzip/AbstractCompressedStream.java  |  388 --
 .../jetty/http/gzip/CompressedResponseWrapper.java |  487 --
 .../java/org/eclipse/jetty/http/package-info.java  |   23 +
 .../eclipse/jetty/http/ssl/SslContextFactory.java  |   41 -
 .../org/eclipse/jetty/http/mime.properties         |  365 +-
 .../org/eclipse/jetty/http/HttpFieldsTest.java     |  363 +-
 .../jetty/http/HttpGeneratorClientTest.java        |  576 +-
 .../jetty/http/HttpGeneratorServerHTTPTest.java    |  368 ++
 .../jetty/http/HttpGeneratorServerTest.java        |  452 ++
 .../org/eclipse/jetty/http/HttpGeneratorTest.java  |  313 --
 .../org/eclipse/jetty/http/HttpParserTest.java     | 2099 ++++++--
 .../org/eclipse/jetty/http/HttpStatusCodeTest.java |    2 +-
 .../java/org/eclipse/jetty/http/HttpURITest.java   |   60 +-
 .../java/org/eclipse/jetty/http/MimeTypesTest.java |   59 +-
 .../java/org/eclipse/jetty/http/PathMapTest.java   |   77 +-
 jetty-io/pom.xml                                   |    7 +-
 .../java/org/eclipse/jetty/io/AbstractBuffer.java  |  728 ---
 .../java/org/eclipse/jetty/io/AbstractBuffers.java |  168 -
 .../org/eclipse/jetty/io/AbstractConnection.java   |  566 +-
 .../org/eclipse/jetty/io/AbstractEndPoint.java     |  205 +
 .../org/eclipse/jetty/io/ArrayByteBufferPool.java  |  133 +
 .../java/org/eclipse/jetty/io/AsyncEndPoint.java   |   83 -
 .../src/main/java/org/eclipse/jetty/io/Buffer.java |  380 --
 .../java/org/eclipse/jetty/io/BufferCache.java     |  169 -
 .../java/org/eclipse/jetty/io/BufferDateCache.java |   61 -
 .../main/java/org/eclipse/jetty/io/BufferUtil.java |  359 --
 .../main/java/org/eclipse/jetty/io/Buffers.java    |   38 -
 .../java/org/eclipse/jetty/io/BuffersFactory.java  |   29 -
 .../java/org/eclipse/jetty/io/ByteArrayBuffer.java |  439 --
 .../org/eclipse/jetty/io/ByteArrayEndPoint.java    |  403 +-
 .../java/org/eclipse/jetty/io/ByteBufferPool.java  |   51 +
 .../java/org/eclipse/jetty/io/ChannelEndPoint.java |  232 +
 .../eclipse/jetty/io/ClientConnectionFactory.java  |   90 +
 .../org/eclipse/jetty/io/ConnectedEndPoint.java    |   25 -
 .../main/java/org/eclipse/jetty/io/Connection.java |  117 +-
 .../main/java/org/eclipse/jetty/io/EndPoint.java   |  267 +-
 .../java/org/eclipse/jetty/io/FillInterest.java    |  135 +
 .../java/org/eclipse/jetty/io/IdleTimeout.java     |  189 +
 .../jetty/io/LeakTrackingByteBufferPool.java       |  125 +
 .../org/eclipse/jetty/io/MappedByteBufferPool.java |  134 +
 .../jetty/io/NegotiatingClientConnection.java      |  130 +
 .../io/NegotiatingClientConnectionFactory.java     |   35 +
 .../eclipse/jetty/io/NetworkTrafficListener.java   |   11 +-
 .../io/NetworkTrafficSelectChannelEndPoint.java    |  154 +
 .../java/org/eclipse/jetty/io/PooledBuffers.java   |  122 -
 .../eclipse/jetty/io/SelectChannelEndPoint.java    |  211 +
 .../java/org/eclipse/jetty/io/SelectorManager.java | 1064 ++++
 .../java/org/eclipse/jetty/io/SimpleBuffers.java   |  117 -
 .../org/eclipse/jetty/io/ThreadLocalBuffers.java   |  135 -
 .../org/eclipse/jetty/io/UncheckedIOException.java |   48 -
 .../org/eclipse/jetty/io/UncheckedPrintWriter.java |    3 +-
 .../src/main/java/org/eclipse/jetty/io/View.java   |  251 -
 .../java/org/eclipse/jetty/io/WriteFlusher.java    |  508 ++
 .../org/eclipse/jetty/io/WriterOutputStream.java   |    5 +-
 .../org/eclipse/jetty/io/bio/SocketEndPoint.java   |  286 -
 .../org/eclipse/jetty/io/bio/StreamEndPoint.java   |  325 --
 .../org/eclipse/jetty/io/bio/StringEndPoint.java   |   94 -
 .../org/eclipse/jetty/io/nio/AsyncConnection.java  |   28 -
 .../org/eclipse/jetty/io/nio/ChannelEndPoint.java  |  509 --
 .../org/eclipse/jetty/io/nio/DirectNIOBuffer.java  |  354 --
 .../eclipse/jetty/io/nio/IndirectNIOBuffer.java    |   62 -
 .../java/org/eclipse/jetty/io/nio/NIOBuffer.java   |   37 -
 .../nio/NetworkTrafficSelectChannelEndPoint.java   |  148 -
 .../jetty/io/nio/RandomAccessFileBuffer.java       |  196 -
 .../jetty/io/nio/SelectChannelEndPoint.java        |  868 ---
 .../org/eclipse/jetty/io/nio/SelectorManager.java  | 1034 ----
 .../org/eclipse/jetty/io/nio/SslConnection.java    |  902 ----
 .../java/org/eclipse/jetty/io/package-info.java    |   23 +
 .../jetty/io/ssl/SslClientConnectionFactory.java   |   73 +
 .../org/eclipse/jetty/io/ssl/SslConnection.java    |  942 ++++
 .../org/eclipse/jetty/io/ssl/package-info.java     |   23 +
 .../eclipse/jetty/io/ArrayByteBufferPoolTest.java  |  147 +
 .../java/org/eclipse/jetty/io/BufferCacheTest.java |  154 -
 .../test/java/org/eclipse/jetty/io/BufferTest.java |  265 -
 .../java/org/eclipse/jetty/io/BufferUtilTest.java  |  122 -
 .../eclipse/jetty/io/ByteArrayEndPointTest.java    |  338 ++
 .../org/eclipse/jetty/io/ChannelEndPointTest.java  |   60 +
 .../java/org/eclipse/jetty/io/EndPointTest.java    |   88 +-
 .../src/test/java/org/eclipse/jetty/io/IOTest.java |  392 +-
 .../java/org/eclipse/jetty/io/IdleTimeoutTest.java |  158 +
 .../eclipse/jetty/io/MappedByteBufferPoolTest.java |  131 +
 .../test/java/org/eclipse/jetty/io/NIOTest.java    |  136 +
 .../io/SelectChannelEndPointInterestsTest.java     |  213 +
 .../jetty/io/SelectChannelEndPointSslTest.java     |  348 ++
 .../jetty/io/SelectChannelEndPointTest.java        |  646 +++
 .../org/eclipse/jetty/io/SelectorManagerTest.java  |  161 +
 .../org/eclipse/jetty/io/SslConnectionTest.java    |  391 ++
 .../eclipse/jetty/io/ThreadLocalBuffersTest.java   |  228 -
 .../org/eclipse/jetty/io/WriteFlusherTest.java     |  735 +++
 .../eclipse/jetty/io/bio/SocketEndPointTest.java   |   56 -
 .../eclipse/jetty/io/nio/ChannelEndPointTest.java  |   61 -
 .../java/org/eclipse/jetty/io/nio/NIOTest.java     |  136 -
 .../jetty/io/nio/SelectChannelEndPointSslTest.java |  221 -
 .../jetty/io/nio/SelectChannelEndPointTest.java    |  457 --
 .../src/test/resources/jetty-logging.properties    |    2 +
 jetty-jaas/pom.xml                                 |   84 +
 jetty-jaas/src/main/config/etc/jetty-jaas.xml      |   17 +
 jetty-jaas/src/main/config/modules/jaas.mod        |   16 +
 .../java/org/eclipse/jetty/jaas/JAASGroup.java     |  152 +
 .../org/eclipse/jetty/jaas/JAASLoginService.java   |  334 ++
 .../java/org/eclipse/jetty/jaas/JAASPrincipal.java |   89 +
 .../main/java/org/eclipse/jetty/jaas/JAASRole.java |   42 +
 .../org/eclipse/jetty/jaas/JAASUserPrincipal.java  |   79 +
 .../org/eclipse/jetty/jaas/RoleCheckPolicy.java    |   36 +
 .../eclipse/jetty/jaas/StrictRoleCheckPolicy.java  |   63 +
 .../jaas/callback/AbstractCallbackHandler.java     |   60 +
 .../jaas/callback/DefaultCallbackHandler.java      |   97 +
 .../jetty/jaas/callback/ObjectCallback.java        |   67 +
 .../jaas/callback/RequestParameterCallback.java    |   61 +
 .../eclipse/jetty/jaas/callback/package-info.java  |   23 +
 .../java/org/eclipse/jetty/jaas/package-info.java  |   23 +
 .../jaas/spi/AbstractDatabaseLoginModule.java      |  143 +
 .../jetty/jaas/spi/AbstractLoginModule.java        |  303 ++
 .../jetty/jaas/spi/DataSourceLoginModule.java      |   90 +
 .../eclipse/jetty/jaas/spi/JDBCLoginModule.java    |  127 +
 .../eclipse/jetty/jaas/spi/LdapLoginModule.java    |  689 +++
 .../jetty/jaas/spi/PropertyFileLoginModule.java    |  135 +
 .../java/org/eclipse/jetty/jaas/spi/UserInfo.java  |   73 +
 .../org/eclipse/jetty/jaas/spi/package-info.java   |   23 +
 jetty-jaspi/pom.xml                                |   38 +-
 jetty-jaspi/src/main/config/modules/jaspi.mod      |   10 +
 .../jetty/security/jaspi/JaspiAuthenticator.java   |   16 +-
 .../security/jaspi/JaspiAuthenticatorFactory.java  |    7 +-
 .../security/jaspi/ServletCallbackHandler.java     |    4 +-
 .../security/jaspi/callback/package-info.java      |   23 +
 .../security/jaspi/modules/BaseAuthModule.java     |    9 +-
 .../security/jaspi/modules/BasicAuthModule.java    |    8 +-
 .../jaspi/modules/ClientCertAuthModule.java        |    2 +-
 .../security/jaspi/modules/DigestAuthModule.java   |   34 +-
 .../security/jaspi/modules/FormAuthModule.java     |   17 +-
 .../jetty/security/jaspi/modules/package-info.java |   23 +
 .../eclipse/jetty/security/jaspi/package-info.java |   23 +
 .../jetty/security/jaspi/HttpHeaderAuthModule.java |  125 +
 .../eclipse/jetty/security/jaspi/JaspiTest.java    |  167 +
 jetty-jaspi/src/test/resources/jaspi.xml           |   39 +
 jetty-jmx/pom.xml                                  |    7 +-
 jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml |   29 +
 jetty-jmx/src/main/config/etc/jetty-jmx.xml        |   90 +-
 jetty-jmx/src/main/config/modules/jmx-remote.mod   |   18 +
 jetty-jmx/src/main/config/modules/jmx.mod          |   13 +
 .../org/eclipse/jetty/jmx/ConnectorServer.java     |   50 +-
 .../java/org/eclipse/jetty/jmx/MBeanContainer.java |  300 +-
 .../java/org/eclipse/jetty/jmx/ObjectMBean.java    |  622 ++-
 .../java/org/eclipse/jetty/jmx/package-info.java   |   23 +
 .../org/eclipse/jetty/util/log/jmx/LogMBean.java   |   15 +-
 .../eclipse/jetty/util/log/jmx/package-info.java   |   23 +
 .../jmx/AggregateLifeCycle-mbean.properties        |    2 -
 .../util/component/jmx/Dumpable-mbean.properties   |    2 -
 .../util/component/jmx/LifeCycle-mbean.properties  |    9 -
 .../jetty/util/log/jmx/Log-mbean.properties        |    8 -
 .../thread/jmx/QueuedThreadPool-mbean.properties   |   16 -
 .../util/thread/jmx/ThreadPool-mbean.properties    |    4 -
 jetty-jmx/src/test/java/com/acme/Derived.java      |   37 +-
 jetty-jmx/src/test/java/com/acme/Managed.java      |   46 +
 jetty-jmx/src/test/java/com/acme/SuperManaged.java |   29 +
 .../src/test/java/com/acme/jmx/DerivedMBean.java   |   52 +
 .../src/test/java/com/acme/jmx/ManagedMBean.java   |   47 +
 .../org/eclipse/jetty/jmx/ObjectMBeanTest.java     |  203 +-
 .../com/acme/jmx/Derived-mbean.properties          |    0
 .../src/test/resources/jetty-logging.properties    |    2 +
 jetty-jndi/pom.xml                                 |   53 +-
 jetty-jndi/src/main/config/modules/jndi.mod        |   11 +
 .../org/eclipse/jetty/jndi/BindingEnumeration.java |    4 +-
 .../org/eclipse/jetty/jndi/ContextFactory.java     |   90 +-
 .../org/eclipse/jetty/jndi/DataSourceCloser.java   |   23 +-
 .../eclipse/jetty/jndi/InitialContextFactory.java  |   20 +-
 .../java/org/eclipse/jetty/jndi/NamingContext.java |  338 +-
 .../java/org/eclipse/jetty/jndi/NamingUtil.java    |   28 +-
 .../jetty/jndi/factories/MailSessionReference.java |   52 +-
 .../eclipse/jetty/jndi/factories/package-info.java |   23 +
 .../eclipse/jetty/jndi/java/javaNameParser.java    |    2 +-
 .../jetty/jndi/java/javaRootURLContext.java        |   61 +-
 .../jetty/jndi/java/javaURLContextFactory.java     |   10 +-
 .../org/eclipse/jetty/jndi/java/package-info.java  |   23 +
 .../eclipse/jetty/jndi/local/localContextRoot.java |  347 +-
 .../org/eclipse/jetty/jndi/local/package-info.java |   23 +
 .../java/org/eclipse/jetty/jndi/package-info.java  |   23 +
 .../jndi/factories/TestMailSessionReference.java   |    9 +-
 .../java/org/eclipse/jetty/jndi/java/TestJNDI.java |   35 +-
 .../org/eclipse/jetty/jndi/java/TestLocalJNDI.java |   88 +-
 jetty-jsp/pom.xml                                  |   83 +-
 .../main/config/modules/jsp-impl/glassfish-jsp.mod |    8 +
 .../config/modules/jsp-impl/glassfish-jstl.mod     |    6 +
 .../org/eclipse/jetty/jsp/JettyJspServlet.java     |  107 +
 jetty-jspc-maven-plugin/pom.xml                    |  115 +
 .../org/eclipse/jetty/jspc/plugin/JspcMojo.java    |  617 +++
 .../eclipse/jetty/jspc/plugin/package-info.java    |   23 +
 .../META-INF/m2e/lifecycle-mapping-metadata.xml    |   30 +
 jetty-maven-plugin/.gitignore                      |    5 +
 jetty-maven-plugin/pom.xml                         |  168 +
 .../jetty/maven/plugin/AbstractJettyMojo.java      |  842 +++
 .../eclipse/jetty/maven/plugin/ConsoleScanner.java |  161 +
 .../eclipse/jetty/maven/plugin/JettyDeployWar.java |   81 +
 .../jetty/maven/plugin/JettyEffectiveWebXml.java   |  156 +
 .../jetty/maven/plugin/JettyRunForkedMojo.java     |  853 +++
 .../eclipse/jetty/maven/plugin/JettyRunMojo.java   |  630 +++
 .../maven/plugin/JettyRunWarExplodedMojo.java      |  181 +
 .../jetty/maven/plugin/JettyRunWarMojo.java        |  156 +
 .../eclipse/jetty/maven/plugin/JettyServer.java    |  156 +
 .../eclipse/jetty/maven/plugin/JettyStartMojo.java |   59 +
 .../eclipse/jetty/maven/plugin/JettyStopMojo.java  |  136 +
 .../jetty/maven/plugin/JettyWebAppContext.java     |  526 ++
 .../maven/plugin/MavenQuickStartConfiguration.java |  132 +
 .../jetty/maven/plugin/MavenServerConnector.java   |  277 +
 .../maven/plugin/MavenWebInfConfiguration.java     |  302 ++
 .../org/eclipse/jetty/maven/plugin/Overlay.java    |   74 +
 .../eclipse/jetty/maven/plugin/OverlayConfig.java  |  341 ++
 .../org/eclipse/jetty/maven/plugin/PluginLog.java  |   44 +
 .../jetty/maven/plugin/ScanTargetPattern.java      |   88 +
 .../jetty/maven/plugin/SelectiveJarResource.java   |  232 +
 .../org/eclipse/jetty/maven/plugin/Starter.java    |  529 ++
 .../jetty/maven/plugin/SystemProperties.java       |   79 +
 .../eclipse/jetty/maven/plugin/SystemProperty.java |  103 +
 .../eclipse/jetty/maven/plugin/WarPluginInfo.java  |  203 +
 .../eclipse/jetty/maven/plugin/package-info.java   |   23 +
 jetty-monitor/{README.txt => README.TXT}           |    0
 jetty-monitor/pom.xml                              |   11 +-
 .../src/main/config/etc/jetty-monitor.xml          |    4 +-
 jetty-monitor/src/main/config/modules/monitor.mod  |   13 +
 .../org/eclipse/jetty/monitor/ThreadMonitor.java   |    6 +-
 .../monitor/integration/JavaMonitorAction.java     |   32 +-
 .../monitor/integration/JavaMonitorTools.java      |   18 +-
 .../monitor/integration/JavaMonitorTrigger.java    |    1 -
 .../jetty/monitor/integration/package-info.java    |   23 +
 .../org/eclipse/jetty/monitor/jmx/MonitorTask.java |    2 +-
 .../eclipse/jetty/monitor/jmx/NotifierGroup.java   |    1 -
 .../jetty/monitor/jmx/ServiceConnection.java       |    2 +-
 .../eclipse/jetty/monitor/jmx/package-info.java    |   23 +
 .../org/eclipse/jetty/monitor/package-info.java    |   23 +
 .../monitor/thread/ThreadMonitorException.java     |    1 -
 .../jetty/monitor/thread/ThreadMonitorInfo.java    |    1 -
 .../eclipse/jetty/monitor/thread/package-info.java |   23 +
 .../monitor/triggers/AggregateEventTrigger.java    |    1 -
 .../jetty/monitor/triggers/AndEventTrigger.java    |    2 +-
 .../jetty/monitor/triggers/AttrEventTrigger.java   |    1 -
 .../monitor/triggers/EqualToAttrEventTrigger.java  |    1 -
 .../triggers/GreaterThanAttrEventTrigger.java      |    1 -
 .../GreaterThanOrEqualToAttrEventTrigger.java      |    1 -
 .../monitor/triggers/LessThanAttrEventTrigger.java |    1 -
 .../LessThanOrEqualToAttrEventTrigger.java         |    1 -
 .../monitor/triggers/RangeAttrEventTrigger.java    |    1 -
 .../triggers/RangeInclAttrEventTrigger.java        |    1 -
 .../jetty/monitor/triggers/package-info.java       |   23 +
 .../jmx/JavaMonitorTools-mbean.properties          |   12 -
 .../monitor/jmx/ThreadMonitor-mbean.properties     |    1 -
 .../jetty/monitor/AttrEventTriggerTest.java        |   75 +-
 .../org/eclipse/jetty/monitor/RequestCounter.java  |    8 +
 .../eclipse/jetty/monitor/ThreadMonitorTest.java   |    1 -
 .../src/test/resources/jetty-logging.properties    |    3 +
 .../monitor/jmx/RequestCounter-mbean.properties    |    3 -
 jetty-nested/pom.xml                               |   64 -
 .../org/eclipse/jetty/nested/NestedConnection.java |  121 -
 .../org/eclipse/jetty/nested/NestedConnector.java  |   90 -
 .../org/eclipse/jetty/nested/NestedEndPoint.java   |   77 -
 .../org/eclipse/jetty/nested/NestedGenerator.java  |  308 --
 .../org/eclipse/jetty/nested/NestedParser.java     |   71 -
 .../org/eclipse/jetty/nested/NestedRequest.java    |   45 -
 jetty-nosql/pom.xml                                |   31 +-
 jetty-nosql/src/main/config/modules/nosql.mod      |    9 +
 .../java/org/eclipse/jetty/nosql/NoSqlSession.java |   56 +-
 .../eclipse/jetty/nosql/NoSqlSessionManager.java   |  195 +-
 .../jetty/nosql/mongodb/MongoSessionIdManager.java |  323 +-
 .../jetty/nosql/mongodb/MongoSessionManager.java   |  316 +-
 .../mongodb/jmx/MongoSessionManagerMBean.java      |    3 +-
 .../jetty/nosql/mongodb/jmx/package-info.java      |   23 +
 .../eclipse/jetty/nosql/mongodb/package-info.java  |   23 +
 .../java/org/eclipse/jetty/nosql/package-info.java |   23 +
 .../jmx/MongoSessionManager-mbean.properties       |    6 -
 jetty-osgi/jetty-osgi-alpn/pom.xml                 |   50 +
 jetty-osgi/jetty-osgi-boot-jsp/pom.xml             |  145 +-
 .../boot/jasper/ContainerTldBundleDiscoverer.java  |  263 +
 .../osgi/boot/jasper/JSTLBundleDiscoverer.java     |  295 ++
 .../PluggableWebAppRegistrationCustomizerImpl.java |  187 -
 .../jasper/WebappRegistrationCustomizerImpl.java   |  271 -
 .../jetty/osgi/boot/jsp/FragmentActivator.java     |   47 +-
 .../osgi/boot/jsp/TagLibOSGiConfiguration.java     |  161 -
 jetty-osgi/jetty-osgi-boot-logback/pom.xml         |  127 -
 .../jetty/osgi/boot/logback/FragmentActivator.java |   92 -
 .../boot/logback/internal/LogbackInitializer.java  |  102 -
 jetty-osgi/jetty-osgi-boot-warurl/pom.xml          |    4 +-
 .../jettyhome/etc/jetty-deployer.xml               |   41 +-
 .../jetty-osgi-boot/jettyhome/etc/jetty-nested.xml |   34 -
 .../jettyhome/etc/jetty-selector.xml               |   23 +-
 jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml |   47 +-
 .../jetty-osgi-boot/jettyhome/etc/webdefault.xml   |  404 --
 jetty-osgi/jetty-osgi-boot/pom.xml                 |   88 +-
 .../osgi/annotations/AnnotationConfiguration.java  |   99 +-
 .../jetty/osgi/annotations/AnnotationParser.java   |   58 +-
 .../jetty/osgi/boot/AbstractContextProvider.java   |  126 +-
 .../eclipse/jetty/osgi/boot/AbstractOSGiApp.java   |   99 +-
 .../jetty/osgi/boot/AbstractWebAppProvider.java    |  164 +-
 .../jetty/osgi/boot/BundleContextProvider.java     |   18 +-
 .../eclipse/jetty/osgi/boot/BundleProvider.java    |    5 +
 .../jetty/osgi/boot/BundleWebAppProvider.java      |    1 -
 .../jetty/osgi/boot/JettyBootstrapActivator.java   |  197 +-
 .../org/eclipse/jetty/osgi/boot/OSGiDeployer.java  |   35 +-
 .../jetty/osgi/boot/OSGiMetaInfConfiguration.java  |  116 -
 .../jetty/osgi/boot/OSGiServerConstants.java       |    2 +
 .../eclipse/jetty/osgi/boot/OSGiUndeployer.java    |   26 +-
 .../jetty/osgi/boot/OSGiWebInfConfiguration.java   |   83 +-
 .../jetty/osgi/boot/OSGiWebappConstants.java       |   11 +-
 .../jetty/osgi/boot/ServiceContextProvider.java    |   10 +-
 .../eclipse/jetty/osgi/boot/ServiceProvider.java   |    5 +
 .../jetty/osgi/boot/ServiceWebAppProvider.java     |    1 -
 .../internal/jsp/TldLocatableURLClassloader.java   |   65 -
 ...URLClassloaderWithInsertedJettyClassloader.java |   69 -
 .../DefaultJettyAtJettyHomeHelper.java             |  280 +-
 .../serverfactory/IManagedJettyServerRegistry.java |   34 -
 .../serverfactory/JettyServerServiceTracker.java   |   37 +-
 .../serverfactory/ServerInstanceWrapper.java       |  323 +-
 .../webapp/BundleFileLocatorHelperFactory.java     |   58 -
 .../osgi/boot/internal/webapp/BundleWatcher.java   |  317 ++
 .../internal/webapp/IWebBundleDeployerHelper.java  |   88 -
 .../webapp/JettyContextHandlerServiceTracker.java  |  211 -
 .../internal/webapp/LibExtClassLoaderHelper.java   |   57 +-
 .../internal/webapp/OSGiWebappClassLoader.java     |   61 +-
 .../osgi/boot/internal/webapp/ServiceWatcher.java  |  230 +
 .../webapp/WebBundleTrackerCustomizer.java         |  250 -
 .../osgi/boot/utils/BundleClassLoaderHelper.java   |    4 +
 .../boot/utils/BundleClassLoaderHelperFactory.java |    4 +
 .../osgi/boot/utils/BundleFileLocatorHelper.java   |   10 +-
 .../boot/utils/BundleFileLocatorHelperFactory.java |   57 +
 .../eclipse/jetty/osgi/boot/utils/EventSender.java |   39 +-
 .../jetty/osgi/boot/utils/FakeURLClassLoader.java  |   83 +
 .../jetty/osgi/boot/utils/OSGiClassLoader.java     |    3 +-
 .../jetty/osgi/boot/utils/TldBundleDiscoverer.java |   43 +
 .../org/eclipse/jetty/osgi/boot/utils/Util.java    |  118 +
 .../boot/utils/WebappRegistrationCustomizer.java   |   61 -
 .../internal/DefaultBundleClassLoaderHelper.java   |  339 +-
 .../utils/internal/DefaultFileLocatorHelper.java   |   80 +-
 .../utils/internal/PackageAdminServiceTracker.java |    8 +-
 .../jetty/osgi/nested/NestedConnectorListener.java |  268 -
 .../nested/NestedConnectorServletDelegate.java     |   51 -
 jetty-osgi/jetty-osgi-equinoxtools/pom.xml         |  121 -
 .../equinoxtools/WebEquinoxToolsActivator.java     |  133 -
 .../console/EquinoxChattingSupport.java            |  156 -
 .../console/EquinoxConsoleContinuationServlet.java |  253 -
 .../console/EquinoxConsoleSyncServlet.java         |   82 -
 .../console/EquinoxConsoleWebSocketServlet.java    |  182 -
 .../equinoxtools/console/WebConsoleSession.java    |  189 -
 .../console/WebConsoleWriterOutputStream.java      |   93 -
 .../contexts/httpservice.xml                       |   10 +-
 jetty-osgi/jetty-osgi-httpservice/pom.xml          |   16 +-
 .../httpservice/HttpServiceErrorHandlerHelper.java |   22 +-
 .../HttpServiceErrorPageErrorHandler.java          |   80 +-
 jetty-osgi/jetty-osgi-npn/pom.xml                  |   47 +
 jetty-osgi/pom.xml                                 |   57 +-
 jetty-osgi/test-jetty-osgi-context/pom.xml         |   47 +-
 .../src/main/context/acme.xml                      |    2 +-
 .../src/main/java/com/acme/osgi/Activator.java     |   11 +-
 jetty-osgi/test-jetty-osgi-webapp/pom.xml          |   40 +-
 .../src/main/java/com/acme/osgi/Activator.java     |   21 +-
 jetty-osgi/test-jetty-osgi/pom.xml                 |  417 +-
 .../src/main/resources/jetty-logging.properties    |    2 +
 .../src/main}/resources/keystore.jks               |  Bin
 .../src/main}/resources/truststore.jks             |  Bin
 .../src/test/config/etc/jetty-deployer.xml         |   24 +-
 .../src/test/config/etc/jetty-https.xml            |   47 +
 .../src/test/config/etc/jetty-selector.xml         |   23 +-
 .../src/test/config/etc/jetty-spdy.xml             |  115 +
 .../src/test/config/etc/jetty-ssl.xml              |   41 +
 .../src/test/config/etc/jetty-testrealm.xml        |    7 +-
 .../test-jetty-osgi/src/test/config/etc/jetty.xml  |   47 +-
 .../test-jetty-osgi/src/test/config/etc/keystore   |  Bin 0 -> 1416 bytes
 .../src/test/config/etc/webdefault.xml             |  404 ++
 .../osgi/boot/JettyOSGiBootContextAsService.java   |  194 -
 .../jetty/osgi/boot/TestJettyOSGiBootCore.java     |  218 -
 .../boot/TestJettyOSGiBootWebAppAsService.java     |  186 -
 .../jetty/osgi/boot/TestJettyOSGiBootWithJsp.java  |  195 -
 .../test/TestJettyOSGiBootContextAsService.java    |  151 +
 .../jetty/osgi/test/TestJettyOSGiBootCore.java     |  175 +
 .../jetty/osgi/test/TestJettyOSGiBootSpdy.java     |  120 +
 .../test/TestJettyOSGiBootWebAppAsService.java     |  158 +
 .../test/TestJettyOSGiBootWithAnnotations.java     |  167 +
 .../jetty/osgi/test/TestJettyOSGiBootWithJsp.java  |  153 +
 .../org/eclipse/jetty/osgi/test/TestOSGiUtil.java  |  189 +
 .../src/test/resources/log4j.properties            |   13 +
 jetty-overlay-deployer/logs/jtrac.log              |   24 -
 jetty-overlay-deployer/pom.xml                     |   10 +-
 .../src/main/config/modules/overlay.mod            |   12 +
 .../eclipse/jetty/overlays/TemplateContext.java    |    4 +-
 .../org/eclipse/jetty/overlays/package-info.java   |   23 +
 .../org/eclipse/jetty/overlays/OverlayServer.java  |    9 +-
 .../jetty/overlays/OverlayedAppProviderTest.java   |    8 +-
 .../instances/myfoo=blue/WEB-INF/overlay.xml       |    2 +-
 .../instances/myfoo=blue/WEB-INF/web-overlay.xml   |    2 +-
 .../instances/myfoo=green/WEB-INF/overlay.xml      |    2 +-
 .../instances/myfoo=green/WEB-INF/web-overlay.xml  |    2 +-
 .../instances/myfoo=red/WEB-INF/overlay.xml        |    2 +-
 .../instances/myfoo=red/WEB-INF/web-overlay.xml    |    2 +-
 .../instances/root=root/WEB-INF/overlay.xml        |    2 +-
 .../overlays/nodes/nodeA/WEB-INF/web-overlay.xml   |    2 +-
 .../home/overlays/nodes/nodeB/WEB-INF/web.xml      |    2 +-
 .../templates/myfoo=foo/WEB-INF/jetty-web.xml      |    2 +-
 .../templates/myfoo=foo/WEB-INF/template.xml       |    2 +-
 .../templates/myfoo=foo/WEB-INF/web-default.xml    |    2 +-
 .../templates/myfoo=foo/WEB-INF/web-overlay.xml    |    2 +-
 .../overlays/templates/root/WEB-INF/overlay.xml    |    2 +-
 .../home/overlays/webapps/foo/WEB-INF/web.xml      |    2 +-
 jetty-plus/pom.xml                                 |   26 +-
 jetty-plus/src/main/config/etc/jetty-plus.xml      |  108 +-
 jetty-plus/src/main/config/modules/plus.mod        |   15 +
 .../plus/annotation/ContainerInitializer.java      |  162 +-
 .../eclipse/jetty/plus/annotation/Injection.java   |   34 +-
 .../jetty/plus/annotation/LifeCycleCallback.java   |   39 +-
 .../annotation/LifeCycleCallbackCollection.java    |   49 +
 .../org/eclipse/jetty/plus/annotation/RunAs.java   |    6 +-
 .../jetty/plus/annotation/RunAsCollection.java     |   24 +-
 .../jetty/plus/annotation/package-info.java        |   23 +
 .../org/eclipse/jetty/plus/jaas/JAASGroup.java     |  152 -
 .../eclipse/jetty/plus/jaas/JAASLoginService.java  |  336 --
 .../org/eclipse/jetty/plus/jaas/JAASPrincipal.java |   89 -
 .../java/org/eclipse/jetty/plus/jaas/JAASRole.java |   42 -
 .../eclipse/jetty/plus/jaas/JAASUserPrincipal.java |   79 -
 .../eclipse/jetty/plus/jaas/RoleCheckPolicy.java   |   36 -
 .../jetty/plus/jaas/StrictRoleCheckPolicy.java     |   63 -
 .../jaas/callback/AbstractCallbackHandler.java     |   60 -
 .../plus/jaas/callback/DefaultCallbackHandler.java |   97 -
 .../jetty/plus/jaas/callback/ObjectCallback.java   |   67 -
 .../jaas/callback/RequestParameterCallback.java    |   61 -
 .../plus/jaas/spi/AbstractDatabaseLoginModule.java |  144 -
 .../jetty/plus/jaas/spi/AbstractLoginModule.java   |  303 --
 .../jetty/plus/jaas/spi/DataSourceLoginModule.java |   89 -
 .../jetty/plus/jaas/spi/JDBCLoginModule.java       |  127 -
 .../jetty/plus/jaas/spi/LdapLoginModule.java       |  689 ---
 .../plus/jaas/spi/PropertyFileLoginModule.java     |  135 -
 .../org/eclipse/jetty/plus/jaas/spi/UserInfo.java  |   73 -
 .../eclipse/jetty/plus/jndi/NamingEntryUtil.java   |   58 +-
 .../org/eclipse/jetty/plus/jndi/package-info.java  |   23 +
 .../plus/security/DataSourceLoginService.java      |  245 +-
 .../eclipse/jetty/plus/security/package-info.java  |   23 +
 .../eclipse/jetty/plus/servlet/ServletHandler.java |   76 -
 .../jetty/plus/webapp/EnvConfiguration.java        |   62 +-
 .../jetty/plus/webapp/PlusConfiguration.java       |   28 +-
 .../eclipse/jetty/plus/webapp/PlusDecorator.java   |  101 +-
 .../jetty/plus/webapp/PlusDescriptorProcessor.java |  230 +-
 .../eclipse/jetty/plus/webapp/package-info.java    |   23 +
 .../eclipse/jetty/plus/jndi/TestNamingEntries.java |   34 +-
 .../jetty/plus/jndi/TestNamingEntryUtil.java       |   13 +-
 .../plus/webapp/PlusDescriptorProcessorTest.java   |   63 +-
 .../jetty/plus/webapp/TestConfiguration.java       |   12 +-
 jetty-plus/src/test/resources/web-fragment-1.xml   |    4 +-
 jetty-plus/src/test/resources/web-fragment-2.xml   |    6 +-
 jetty-plus/src/test/resources/web-fragment-3.xml   |    4 +-
 jetty-plus/src/test/resources/web-fragment-4.xml   |   16 +
 jetty-plus/src/test/resources/web.xml              |    2 +-
 jetty-policy/pom.xml                               |  139 -
 jetty-policy/src/main/config/etc/jetty-policy.xml  |   23 -
 .../src/main/config/lib/policy/global.policy       |   43 -
 .../src/main/config/lib/policy/jetty-jmx.policy    |   54 -
 .../src/main/config/lib/policy/jetty-start.policy  |   40 -
 .../src/main/config/lib/policy/jetty-work.policy   |   19 -
 .../src/main/config/lib/policy/jetty.policy        |   96 -
 .../src/main/config/lib/policy/temp-dirs.policy    |   30 -
 .../java/org/eclipse/jetty/policy/JettyPolicy.java |  462 --
 .../jetty/policy/JettyPolicyConfigurator.java      |   58 -
 .../java/org/eclipse/jetty/policy/PolicyBlock.java |  102 -
 .../org/eclipse/jetty/policy/PolicyContext.java    |  200 -
 .../org/eclipse/jetty/policy/PolicyException.java  |   45 -
 .../org/eclipse/jetty/policy/PolicyMonitor.java    |  328 --
 .../eclipse/jetty/policy/entry/AbstractEntry.java  |   52 -
 .../org/eclipse/jetty/policy/entry/GrantEntry.java |  209 -
 .../eclipse/jetty/policy/entry/KeystoreEntry.java  |   98 -
 .../jetty/policy/entry/PermissionEntry.java        |  226 -
 .../eclipse/jetty/policy/entry/PrincipalEntry.java |  115 -
 .../jetty/policy/loader/DefaultPolicyLoader.java   |  102 -
 .../jetty/policy/loader/PolicyFileScanner.java     |  459 --
 .../jetty/policy/JettyPolicyRuntimeTest.java       |  265 -
 .../org/eclipse/jetty/policy/JettyPolicyTest.java  |  424 --
 .../eclipse/jetty/policy/PolicyContextTest.java    |  120 -
 .../eclipse/jetty/policy/PolicyMonitorTest.java    |  138 -
 .../context/jetty-certificate-alias.policy         |    6 -
 .../resources/context/jetty-certificate.policy     |    6 -
 .../monitor-test-1/global-all-permission.policy    |    3 -
 .../monitor-test-2/global-all-permission.policy    |    3 -
 .../resources/monitor-test-2/template1.template    |    3 -
 .../monitor-test-3/global-all-permission.policy    |    3 -
 .../global-file-read-only-tmp-permission.policy    |   10 -
 .../monitor-test-3/jetty-bad-certificate.policy    |   25 -
 .../monitor-test-3/jetty-certificate.policy        |   31 -
 .../multiple-codebase-file-permission.policy       |   13 -
 .../multiple-codebase-mixed-permission.policy      |   16 -
 .../single-codebase-file-permission-2.policy       |    3 -
 .../single-codebase-file-permission-3.policy       |    3 -
 .../single-codebase-file-permission.policy         |    3 -
 .../resources/monitor-test-3/template1.template    |    3 -
 .../policy-test-1/global-all-permission.policy     |    3 -
 .../single-codebase-file-permission.policy         |    3 -
 .../multiple-codebase-file-permission.policy       |   13 -
 .../multiple-codebase-mixed-permission.policy      |   16 -
 .../single-codebase-file-permission-2.policy       |    3 -
 .../single-codebase-file-permission.policy         |    3 -
 .../single-codebase-file-permission-2.policy       |    3 -
 .../single-codebase-file-permission-3.policy       |    3 -
 .../single-codebase-file-permission.policy         |    3 -
 .../runtime-test-1/global-all-permission.policy    |    3 -
 .../runtime-test-2/a/global-all-permission.policy  |    3 -
 .../b/global-file-read-only-tmp-permission.policy  |   10 -
 .../global-file-read-only-tmp-permission.policy    |   10 -
 .../runtime-test-4/jetty-certificate.policy        |   31 -
 .../runtime-test-5/jetty-bad-certificate.policy    |   25 -
 jetty-proxy/pom.xml                                |  106 +
 jetty-proxy/src/main/config/etc/jetty-proxy.xml    |   35 +
 jetty-proxy/src/main/config/modules/proxy.mod      |   22 +
 .../eclipse/jetty/proxy/AbstractProxyServlet.java  |  731 +++
 .../jetty/proxy/AfterContentTransformer.java       |  494 ++
 .../eclipse/jetty/proxy/AsyncMiddleManServlet.java |  786 +++
 .../org/eclipse/jetty/proxy/AsyncProxyServlet.java |  303 ++
 .../org/eclipse/jetty/proxy/BalancerServlet.java   |  314 ++
 .../org/eclipse/jetty/proxy/ConnectHandler.java    |  634 +++
 .../org/eclipse/jetty/proxy/ProxyConnection.java   |  158 +
 .../java/org/eclipse/jetty/proxy/ProxyServlet.java |  343 ++
 .../java/org/eclipse/jetty/proxy/package-info.java |   23 +
 .../jetty/proxy/AbstractConnectHandlerTest.java    |   79 +
 .../jetty/proxy/AsyncMiddleManServletTest.java     | 1703 ++++++
 .../jetty/proxy/AsyncProxyServletLoadTest.java     |  236 +
 .../eclipse/jetty/proxy/BalancerServletTest.java   |  201 +
 .../eclipse/jetty/proxy/ConnectHandlerSSLTest.java |  201 +
 .../eclipse/jetty/proxy/ConnectHandlerTest.java    |  782 +++
 .../org/eclipse/jetty/proxy/EchoHttpServlet.java   |   36 +
 .../org/eclipse/jetty/proxy/EmptyHttpServlet.java  |   33 +
 .../java/org/eclipse/jetty/proxy/ProxyServer.java  |   51 +
 .../jetty/proxy/ProxyServletFailureTest.java       |  419 ++
 .../org/eclipse/jetty/proxy/ProxyServletTest.java  | 1234 +++++
 .../eclipse/jetty/proxy/ProxyTunnellingTest.java   |  434 ++
 .../org/eclipse/jetty/proxy/ReverseProxyTest.java  |  153 +
 .../src/test/resources/jetty-logging.properties    |    4 +
 .../src/test/resources/keystore                    |  Bin
 jetty-quickstart/README.txt                        |    6 +
 jetty-quickstart/pom.xml                           |  104 +
 .../src/main/config/etc/example-quickstart.xml     |   27 +
 .../src/main/config/modules/quickstart.mod         |   12 +
 .../PreconfigureDescriptorProcessor.java           |   88 +
 .../quickstart/PreconfigureQuickStartWar.java      |  129 +
 .../jetty/quickstart/QuickStartConfiguration.java  |  154 +
 .../quickstart/QuickStartDescriptorGenerator.java  |  688 +++
 .../quickstart/QuickStartDescriptorProcessor.java  |  218 +
 .../eclipse/jetty/quickstart/QuickStartWebApp.java |  182 +
 jetty-rewrite/pom.xml                              |   18 +-
 .../src/main/config/etc/jetty-rewrite.xml          |  122 +-
 jetty-rewrite/src/main/config/modules/rewrite.mod  |   12 +
 .../jetty/rewrite/handler/CompactPathRule.java     |   56 +
 .../jetty/rewrite/handler/CookiePatternRule.java   |   14 +
 .../rewrite/handler/ForwardedSchemeHeaderRule.java |    1 +
 .../jetty/rewrite/handler/HeaderPatternRule.java   |    2 +
 .../jetty/rewrite/handler/HeaderRegexRule.java     |  128 +
 .../eclipse/jetty/rewrite/handler/HeaderRule.java  |    1 +
 .../eclipse/jetty/rewrite/handler/MsieSslRule.java |   18 +-
 .../eclipse/jetty/rewrite/handler/PatternRule.java |    2 +
 .../eclipse/jetty/rewrite/handler/ProxyRule.java   |  503 --
 .../jetty/rewrite/handler/RedirectPatternRule.java |    2 +
 .../eclipse/jetty/rewrite/handler/RegexRule.java   |    2 +
 .../jetty/rewrite/handler/ResponsePatternRule.java |    2 +
 .../jetty/rewrite/handler/RewriteHandler.java      |   37 +-
 .../jetty/rewrite/handler/RewritePatternRule.java  |   55 +-
 .../jetty/rewrite/handler/RewriteRegexRule.java    |   11 +-
 .../org/eclipse/jetty/rewrite/handler/Rule.java    |    5 +-
 .../jetty/rewrite/handler/RuleContainer.java       |   14 +-
 .../rewrite/handler/VirtualHostRuleContainer.java  |    4 +-
 .../jetty/rewrite/handler/package-info.java        |   23 +
 .../rewrite/handler/AbstractRuleTestCase.java      |   78 +-
 .../rewrite/handler/CookiePatternRuleTest.java     |   47 +-
 .../handler/ForwardedSchemeHeaderRuleTest.java     |    6 +-
 .../rewrite/handler/HeaderPatternRuleTest.java     |    4 +-
 .../jetty/rewrite/handler/HeaderRegexRuleTest.java |  131 +
 .../jetty/rewrite/handler/LegacyRuleTest.java      |    4 +-
 .../jetty/rewrite/handler/MsieSslRuleTest.java     |   76 +-
 .../jetty/rewrite/handler/PatternRuleTest.java     |    8 +-
 .../jetty/rewrite/handler/ProxyRuleTest.java       |  136 -
 .../rewrite/handler/RedirectPatternRuleTest.java   |    8 +-
 .../rewrite/handler/RedirectRegexRuleTest.java     |   12 +-
 .../jetty/rewrite/handler/RegexRuleTest.java       |    8 +-
 .../rewrite/handler/ResponsePatternRuleTest.java   |    4 +-
 .../jetty/rewrite/handler/RewriteHandlerTest.java  |   44 +-
 .../rewrite/handler/RewritePatternRuleTest.java    |   96 +-
 .../rewrite/handler/RewriteRegexRuleTest.java      |   14 +-
 .../jetty/rewrite/handler/ValidUrlRuleTest.java    |    5 +-
 .../handler/VirtualHostRuleContainerTest.java      |   11 +-
 .../jetty-rewrite.xml                              |   42 +-
 jetty-rhttp/README.TXT                             |   33 +
 jetty-rhttp/jetty-rhttp-client/pom.xml             |   95 +
 .../eclipse/jetty/rhttp/client/AbstractClient.java |  270 +
 .../eclipse/jetty/rhttp/client/ApacheClient.java   |  156 +
 .../eclipse/jetty/rhttp/client/ClientListener.java |   67 +
 .../eclipse/jetty/rhttp/client/JettyClient.java    |  306 ++
 .../eclipse/jetty/rhttp/client/RHTTPClient.java    |  133 +
 .../eclipse/jetty/rhttp/client/RHTTPListener.java  |   36 +
 .../eclipse/jetty/rhttp/client/RHTTPRequest.java   |  266 +
 .../eclipse/jetty/rhttp/client/RHTTPResponse.java  |  256 +
 .../jetty/rhttp/client/RetryingApacheClient.java   |  112 +
 .../jetty/rhttp/client/ApacheClientTest.java       |   75 +
 .../org/eclipse/jetty/rhttp/client/ClientTest.java |  299 ++
 .../jetty/rhttp/client/JettyClientTest.java        |   52 +
 .../eclipse/jetty/rhttp/client/RequestTest.java    |   85 +
 .../eclipse/jetty/rhttp/client/ResponseTest.java   |   85 +
 jetty-rhttp/jetty-rhttp-connector/pom.xml          |   96 +
 .../src/main/config/etc/jetty-rhttp.xml            |   23 +
 .../rhttp/connector/ReverseHTTPConnector.java      |  170 +
 .../rhttp/connector/ReverseHTTPConnectorTest.java  |  187 +
 .../jetty/rhttp/connector/TestReverseServer.java   |   58 +
 jetty-rhttp/jetty-rhttp-gateway/pom.xml            |   99 +
 .../jetty/rhttp/gateway/ClientDelegate.java        |   92 +
 .../jetty/rhttp/gateway/ConnectorServlet.java      |  224 +
 .../jetty/rhttp/gateway/ExternalRequest.java       |   54 +
 .../jetty/rhttp/gateway/ExternalServlet.java       |   88 +
 .../org/eclipse/jetty/rhttp/gateway/Gateway.java   |   99 +
 .../jetty/rhttp/gateway/GatewayProxyServer.java    |  228 +
 .../eclipse/jetty/rhttp/gateway/GatewayServer.java |  171 +
 .../jetty/rhttp/gateway/HostTargetIdRetriever.java |   54 +
 .../java/org/eclipse/jetty/rhttp/gateway/Main.java |  128 +
 .../rhttp/gateway/StandardClientDelegate.java      |  172 +
 .../rhttp/gateway/StandardExternalRequest.java     |  189 +
 .../jetty/rhttp/gateway/StandardGateway.java       |  131 +
 .../rhttp/gateway/StandardTargetIdRetriever.java   |   40 +
 .../jetty/rhttp/gateway/TargetIdRetriever.java     |   40 +
 .../org/eclipse/jetty/rhttp/gateway/Utils.java     |   40 +
 .../jetty/rhttp/gateway/ClientTimeoutTest.java     |  115 +
 .../jetty/rhttp/gateway/DisconnectClientTest.java  |   93 +
 .../jetty/rhttp/gateway/DuplicateClientTest.java   |   84 +
 .../gateway/ExternalRequestNotSuspendedTest.java   |  186 +
 .../jetty/rhttp/gateway/ExternalTimeoutTest.java   |  126 +
 .../jetty/rhttp/gateway/GatewayEchoServer.java     |  109 +
 .../jetty/rhttp/gateway/GatewayEchoTest.java       |   77 +
 .../jetty/rhttp/gateway/GatewayLoadTest.java       |  202 +
 .../jetty/rhttp/gateway/GatewayTimeoutTest.java    |  130 +
 .../jetty/rhttp/gateway/HandshakeClientTest.java   |   75 +
 .../rhttp/gateway/HostTargetIdRetrieverTest.java   |  107 +
 .../src/test/resources/log4j.properties            |   13 +
 jetty-rhttp/jetty-rhttp-loadtest/pom.xml           |   58 +
 .../org/eclipse/jetty/rhttp/loadtest/Loader.java   |  429 ++
 .../org/eclipse/jetty/rhttp/loadtest/Server.java   |   69 +
 .../src/main/resources/log4j.properties            |   13 +
 jetty-rhttp/pom.xml                                |  107 +
 jetty-runner/pom.xml                               |  101 +
 .../main/java/org/eclipse/jetty/runner/Runner.java |  566 ++
 .../org/eclipse/jetty/runner/package-info.java     |   23 +
 jetty-security/pom.xml                             |    4 +-
 .../src/main/config/modules/security.mod           |    9 +
 .../jetty/security/AbstractUserAuthentication.java |   98 +
 .../org/eclipse/jetty/security/Authenticator.java  |   46 +-
 .../eclipse/jetty/security/ConstraintAware.java    |   16 +
 .../jetty/security/ConstraintSecurityHandler.java  |  516 +-
 .../jetty/security/CrossContextPsuedoSession.java  |    1 +
 .../jetty/security/DefaultIdentityService.java     |   12 +-
 .../jetty/security/DefaultUserIdentity.java        |   17 +-
 .../security/HashCrossContextPsuedoSession.java    |    7 +-
 .../eclipse/jetty/security/HashLoginService.java   |    4 +
 .../eclipse/jetty/security/IdentityService.java    |   19 +-
 .../eclipse/jetty/security/JDBCLoginService.java   |   81 +-
 .../eclipse/jetty/security/MappedLoginService.java |   57 +-
 .../eclipse/jetty/security/PropertyUserStore.java  |   24 +-
 .../java/org/eclipse/jetty/security/RoleInfo.java  |   27 +-
 .../eclipse/jetty/security/SecurityHandler.java    |  228 +-
 .../eclipse/jetty/security/SpnegoLoginService.java |   54 +-
 .../eclipse/jetty/security/SpnegoUserIdentity.java |    6 +-
 .../jetty/security/SpnegoUserPrincipal.java        |   12 +-
 .../eclipse/jetty/security/UserAuthentication.java |   25 +-
 .../authentication/BasicAuthenticator.java         |   23 +-
 .../authentication/ClientCertAuthenticator.java    |   21 +-
 .../authentication/DeferredAuthentication.java     |  114 +-
 .../authentication/DigestAuthenticator.java        |   78 +-
 .../security/authentication/FormAuthenticator.java |  230 +-
 .../authentication/LoginAuthenticator.java         |   57 +-
 .../security/authentication/LoginCallback.java     |   10 +-
 .../security/authentication/LoginCallbackImpl.java |    2 +-
 .../authentication/SessionAuthentication.java      |   57 +-
 .../authentication/SpnegoAuthenticator.java        |   47 +-
 .../security/authentication/package-info.java      |   23 +
 .../org/eclipse/jetty/security/package-info.java   |   23 +
 .../jetty/security/AliasedConstraintTest.java      |  348 +-
 .../org/eclipse/jetty/security/ConstraintTest.java |  846 +--
 .../jetty/security/DataConstraintsTest.java        |  150 +-
 .../jetty/security/PropertyUserStoreTest.java      |   24 +-
 .../jetty/security/SpecExampleConstraintTest.java  |   61 +-
 jetty-server/pom.xml                               |   19 +-
 .../src/main/config/etc/home-base-warning.xml      |    8 +
 jetty-server/src/main/config/etc/jetty-bio-ssl.xml |   25 -
 jetty-server/src/main/config/etc/jetty-bio.xml     |   23 -
 jetty-server/src/main/config/etc/jetty-debug.xml   |    4 +-
 .../src/main/config/etc/jetty-fileserver.xml       |   37 -
 jetty-server/src/main/config/etc/jetty-http.xml    |   47 +
 jetty-server/src/main/config/etc/jetty-https.xml   |   53 +
 .../src/main/config/etc/jetty-ipaccess.xml         |   18 +-
 .../src/main/config/etc/jetty-lowresources.xml     |   22 +
 jetty-server/src/main/config/etc/jetty-proxy.xml   |   64 -
 .../src/main/config/etc/jetty-requestlog.xml       |   48 +-
 jetty-server/src/main/config/etc/jetty-ssl.xml     |   66 +-
 jetty-server/src/main/config/etc/jetty-stats.xml   |   21 +-
 jetty-server/src/main/config/etc/jetty-xinetd.xml  |   16 +-
 jetty-server/src/main/config/etc/jetty.xml         |  125 +-
 jetty-server/src/main/config/etc/keystore.pkf      |   20 +
 .../src/main/config/modules/continuation.mod       |    6 +
 jetty-server/src/main/config/modules/debug.mod     |    9 +
 jetty-server/src/main/config/modules/ext.mod       |   11 +
 .../src/main/config/modules/home-base-warning.mod  |    7 +
 jetty-server/src/main/config/modules/http.mod      |   27 +
 jetty-server/src/main/config/modules/https.mod     |   19 +
 jetty-server/src/main/config/modules/ipaccess.mod  |    9 +
 jetty-server/src/main/config/modules/jvm.mod       |   23 +
 .../src/main/config/modules/lowresources.mod       |   18 +
 .../src/main/config/modules/requestlog.mod         |   30 +
 jetty-server/src/main/config/modules/resources.mod |   10 +
 jetty-server/src/main/config/modules/server.mod    |   49 +
 jetty-server/src/main/config/modules/ssl.mod       |   40 +
 jetty-server/src/main/config/modules/stats.mod     |    9 +
 jetty-server/src/main/config/modules/xinetd.mod    |   17 +
 .../jetty/server/AbstractConnectionFactory.java    |   92 +
 .../eclipse/jetty/server/AbstractConnector.java    | 1477 ++----
 .../jetty/server/AbstractHttpConnection.java       | 1273 -----
 .../jetty/server/AbstractNCSARequestLog.java       |  482 ++
 .../jetty/server/AbstractNetworkConnector.java     |  125 +
 .../eclipse/jetty/server/AsyncContextEvent.java    |  164 +
 .../eclipse/jetty/server/AsyncContextState.java    |  185 +
 .../eclipse/jetty/server/AsyncContinuation.java    | 1160 ----
 .../eclipse/jetty/server/AsyncHttpConnection.java  |  220 -
 .../eclipse/jetty/server/AsyncNCSARequestLog.java  |   21 +-
 .../org/eclipse/jetty/server/Authentication.java   |    9 +
 .../jetty/server/BlockingHttpConnection.java       |  138 -
 .../jetty/server/ByteBufferQueuedHttpInput.java    |   53 +
 .../org/eclipse/jetty/server/ClassLoaderDump.java  |   66 +
 .../eclipse/jetty/server/ConnectionFactory.java    |   57 +
 .../java/org/eclipse/jetty/server/Connector.java   |  367 +-
 .../eclipse/jetty/server/ConnectorStatistics.java  |  308 ++
 .../org/eclipse/jetty/server/CookieCutter.java     |   39 +-
 .../java/org/eclipse/jetty/server/Dispatcher.java  |  306 +-
 .../eclipse/jetty/server/EncodingHttpWriter.java   |   70 +
 .../jetty/server/ForwardedRequestCustomizer.java   |  289 +
 .../java/org/eclipse/jetty/server/Handler.java     |   31 +-
 .../org/eclipse/jetty/server/HandlerContainer.java |    5 +
 .../org/eclipse/jetty/server/HomeBaseWarning.java  |   75 +
 .../eclipse/jetty/server/HostHeaderCustomizer.java |   71 +
 .../java/org/eclipse/jetty/server/HttpChannel.java |  898 ++++
 .../org/eclipse/jetty/server/HttpChannelState.java |  742 +++
 .../eclipse/jetty/server/HttpConfiguration.java    |  342 ++
 .../org/eclipse/jetty/server/HttpConnection.java   |  761 +++
 .../jetty/server/HttpConnectionFactory.java        |   64 +
 .../java/org/eclipse/jetty/server/HttpInput.java   |  525 +-
 .../eclipse/jetty/server/HttpInputOverHTTP.java    |  146 +
 .../java/org/eclipse/jetty/server/HttpOutput.java  | 1149 +++-
 .../org/eclipse/jetty/server/HttpTransport.java    |   40 +
 .../java/org/eclipse/jetty/server/HttpWriter.java  |  244 +-
 .../eclipse/jetty/server/InclusiveByteRange.java   |    7 +-
 .../eclipse/jetty/server/Iso88591HttpWriter.java   |   75 +
 .../org/eclipse/jetty/server/LocalConnector.java   |  280 +-
 .../eclipse/jetty/server/LowResourceMonitor.java   |  350 ++
 .../org/eclipse/jetty/server/NCSARequestLog.java   |  507 +-
 .../jetty/server/NegotiatingServerConnection.java  |  162 +
 .../server/NegotiatingServerConnectionFactory.java |  103 +
 .../org/eclipse/jetty/server/NetworkConnector.java |   72 +
 .../server/NetworkTrafficServerConnector.java      |   92 +
 .../org/eclipse/jetty/server/QueuedHttpInput.java  |  146 +
 .../jetty/server/QuietServletException.java        |   53 +
 .../java/org/eclipse/jetty/server/Request.java     | 1272 ++---
 .../org/eclipse/jetty/server/ResourceCache.java    |  142 +-
 .../java/org/eclipse/jetty/server/Response.java    | 1623 +++---
 .../jetty/server/SecureRequestCustomizer.java      |  172 +
 .../main/java/org/eclipse/jetty/server/Server.java |  603 ++-
 .../org/eclipse/jetty/server/ServerConnector.java  |  524 ++
 .../jetty/server/ServletRequestHttpWrapper.java    |   76 +-
 .../jetty/server/ServletResponseHttpWrapper.java   |   37 +-
 .../org/eclipse/jetty/server/SessionIdManager.java |   13 +
 .../org/eclipse/jetty/server/SessionManager.java   |   17 +-
 .../org/eclipse/jetty/server/ShutdownMonitor.java  |  243 +-
 .../org/eclipse/jetty/server/Slf4jRequestLog.java  |   69 +
 .../eclipse/jetty/server/SslConnectionFactory.java |  102 +
 .../org/eclipse/jetty/server/UserIdentity.java     |   23 +-
 .../org/eclipse/jetty/server/Utf8HttpWriter.java   |  188 +
 .../eclipse/jetty/server/bio/SocketConnector.java  |  325 --
 .../jetty/server/handler/AbstractHandler.java      |   31 +-
 .../server/handler/AbstractHandlerContainer.java   |   65 +-
 .../server/handler/AllowSymLinkAliasChecker.java   |   97 +
 .../jetty/server/handler/AsyncDelayHandler.java    |  153 +
 .../jetty/server/handler/ConnectHandler.java       | 1025 ----
 .../jetty/server/handler/ContextHandler.java       | 1313 +++--
 .../server/handler/ContextHandlerCollection.java   |  363 +-
 .../eclipse/jetty/server/handler/DebugHandler.java |   64 +-
 .../jetty/server/handler/DefaultHandler.java       |   87 +-
 .../eclipse/jetty/server/handler/ErrorHandler.java |  115 +-
 .../eclipse/jetty/server/handler/GzipHandler.java  |  356 --
 .../jetty/server/handler/HandlerCollection.java    |  209 +-
 .../eclipse/jetty/server/handler/HandlerList.java  |    6 +-
 .../jetty/server/handler/HandlerWrapper.java       |   67 +-
 .../jetty/server/handler/HotSwapHandler.java       |   34 +-
 .../jetty/server/handler/IPAccessHandler.java      |  213 +-
 .../jetty/server/handler/IdleTimeoutHandler.java   |   38 +-
 .../jetty/server/handler/MovedContextHandler.java  |   20 +-
 .../eclipse/jetty/server/handler/ProxyHandler.java |   51 -
 .../jetty/server/handler/RequestLogHandler.java    |  148 +-
 .../jetty/server/handler/ResourceHandler.java      |  311 +-
 .../jetty/server/handler/ScopedHandler.java        |   89 +-
 .../server/handler/SecuredRedirectHandler.java     |   76 +
 .../jetty/server/handler/ShutdownHandler.java      |  170 +-
 .../jetty/server/handler/StatisticsHandler.java    |  259 +-
 .../server/handler/jmx/AbstractHandlerMBean.java   |   30 +-
 .../server/handler/jmx/ContextHandlerMBean.java    |   21 +-
 .../jetty/server/handler/jmx/package-info.java     |   23 +
 .../eclipse/jetty/server/handler/package-info.java |   23 +
 .../jetty/server/jmx/AbstractConnectorMBean.java   |   41 +
 .../org/eclipse/jetty/server/jmx/ServerMBean.java  |    5 +
 .../org/eclipse/jetty/server/jmx/package-info.java |   23 +
 .../jetty/server/nio/AbstractNIOConnector.java     |   53 -
 .../jetty/server/nio/BlockingChannelConnector.java |  366 --
 .../server/nio/InheritedChannelConnector.java      |   75 -
 .../org/eclipse/jetty/server/nio/NIOConnector.java |   31 -
 .../nio/NetworkTrafficSelectChannelConnector.java  |   57 +-
 .../jetty/server/nio/SelectChannelConnector.java   |  334 --
 .../org/eclipse/jetty/server/nio/package-info.java |   23 +
 .../org/eclipse/jetty/server/package-info.java     |   23 +
 .../jetty/server/session/AbstractSession.java      |  304 +-
 .../server/session/AbstractSessionIdManager.java   |  224 +-
 .../server/session/AbstractSessionManager.java     |  523 +-
 .../jetty/server/session/HashSessionIdManager.java |   85 +-
 .../jetty/server/session/HashSessionManager.java   |  328 +-
 .../jetty/server/session/HashedSession.java        |  104 +-
 .../jetty/server/session/JDBCSessionIdManager.java | 1407 +++--
 .../jetty/server/session/JDBCSessionManager.java   |  728 +--
 .../eclipse/jetty/server/session/MemSession.java   |  146 +
 .../jetty/server/session/SessionHandler.java       |   57 +-
 .../jetty/server/session/jmx/package-info.java     |   23 +
 .../eclipse/jetty/server/session/package-info.java |   23 +
 .../org/eclipse/jetty/server/ssl/ServletSSL.java   |   88 -
 .../eclipse/jetty/server/ssl/SslCertificates.java  |  182 -
 .../org/eclipse/jetty/server/ssl/SslConnector.java |  348 --
 .../server/ssl/SslSelectChannelConnector.java      |  653 ---
 .../jetty/server/ssl/SslSocketConnector.java       |  712 ---
 .../handler/jmx/AbstractHandler-mbean.properties   |    1 -
 .../handler/jmx/ContextHandler-mbean.properties    |   24 -
 .../jmx/ContextHandlerCollection-mbean.properties  |    2 -
 .../handler/jmx/HandlerCollection-mbean.properties |    2 -
 .../handler/jmx/HandlerWrapper-mbean.properties    |    2 -
 .../handler/jmx/StatisticsHandler-mbean.properties |   28 -
 .../server/jmx/AbstractConnector-mbean.properties  |   19 -
 .../jetty/server/jmx/Connector-mbean.properties    |   29 -
 .../jetty/server/jmx/Handler-mbean.properties      |    3 -
 .../server/jmx/HandlerContainer-mbean.properties   |    3 -
 .../server/jmx/NCSARequestLog-mbean.properties     |    6 -
 .../jetty/server/jmx/Server-mbean.properties       |    9 -
 .../jmx/SelectChannelConnector-mbean.properties    |    2 -
 .../jmx/AbstractSessionManager-mbean.properties    |   19 -
 .../jetty/server/AbstractConnectorTest.java        |  259 -
 .../org/eclipse/jetty/server/AbstractHttpTest.java |  144 +
 .../eclipse/jetty/server/AsyncRequestReadTest.java |  365 +-
 .../org/eclipse/jetty/server/AsyncStressTest.java  |   36 +-
 .../jetty/server/BlockingChannelCloseTest.java     |   34 -
 .../jetty/server/BlockingChannelServerTest.java    |   34 -
 .../jetty/server/BlockingChannelTimeoutTest.java   |   46 -
 .../jetty/server/CheckReverseProxyHeadersTest.java |   51 +-
 .../jetty/server/ConnectionOpenCloseTest.java      |  235 +
 .../jetty/server/ConnectorCloseTestBase.java       |   70 +-
 .../eclipse/jetty/server/ConnectorTimeoutTest.java |  219 +-
 .../java/org/eclipse/jetty/server/DumpHandler.java |  117 +-
 .../eclipse/jetty/server/EncodedHttpURITest.java   |   50 -
 .../eclipse/jetty/server/ExtendedServerTest.java   |  159 +
 .../org/eclipse/jetty/server/GracefulStopTest.java |  134 +
 .../eclipse/jetty/server/HalfCloseRaceTest.java    |   86 -
 .../org/eclipse/jetty/server/HalfCloseTest.java    |  214 +
 .../jetty/server/HostHeaderCustomizerTest.java     |   97 +
 .../eclipse/jetty/server/HttpConnectionTest.java   |  509 +-
 .../HttpManyWaysToAsyncCommitBadBehaviourTest.java |  124 +
 .../server/HttpManyWaysToAsyncCommitTest.java      |  817 +++
 .../jetty/server/HttpManyWaysToCommitTest.java     |  593 +++
 .../org/eclipse/jetty/server/HttpOutputTest.java   |  760 +++
 .../eclipse/jetty/server/HttpServerTestBase.java   | 1416 ++---
 .../jetty/server/HttpServerTestFixture.java        |   92 +-
 .../java/org/eclipse/jetty/server/HttpURITest.java |   90 +-
 .../org/eclipse/jetty/server/HttpWriterTest.java   |  209 +-
 .../jetty/server/LocalAsyncContextTest.java        |   99 +-
 .../eclipse/jetty/server/LocalConnectorTest.java   |  173 +
 .../jetty/server/LowResourcesMonitorTest.java      |  197 +
 .../jetty/server/NetworkTrafficListenerTest.java   |  131 +-
 .../eclipse/jetty/server/PartialRFC2616Test.java   |  627 +++
 .../eclipse/jetty/server/QueuedHttpInputTest.java  |   33 +
 .../java/org/eclipse/jetty/server/RFC2616Test.java |  852 ---
 .../java/org/eclipse/jetty/server/RequestTest.java |  693 ++-
 .../eclipse/jetty/server/ResourceCacheTest.java    |  132 +-
 .../org/eclipse/jetty/server/ResponseTest.java     |  742 +--
 .../server/SelectChannelAsyncContextTest.java      |   64 +-
 .../server/SelectChannelConnectorCloseTest.java    |   11 +-
 .../jetty/server/SelectChannelServerTest.java      |   25 +-
 .../jetty/server/SelectChannelStatisticsTest.java  |  266 +
 .../jetty/server/SelectChannelTimeoutTest.java     |   27 +-
 .../eclipse/jetty/server/ServerConnectorTest.java  |  197 +
 .../java/org/eclipse/jetty/server/ServerTest.java  |   60 -
 .../eclipse/jetty/server/ShutdownMonitorTest.java  |  202 +-
 .../server/SlowClientWithPipelinedRequestTest.java |   42 +-
 .../jetty/server/SocketConnectorCloseTest.java     |   36 -
 .../org/eclipse/jetty/server/SocketServerTest.java |   36 -
 .../eclipse/jetty/server/SocketTimeoutTest.java    |   34 -
 .../java/org/eclipse/jetty/server/StressTest.java  |   82 +-
 .../org/eclipse/jetty/server/SuspendHandler.java   |    1 +
 .../server/handler/AbstractConnectHandlerTest.java |  217 -
 .../jetty/server/handler/AllowAllVerifier.java     |   31 +
 .../server/handler/BadRequestLogHandlerTest.java   |  193 +
 .../server/handler/ConnectHandlerSSLTest.java      |  362 --
 .../jetty/server/handler/ConnectHandlerTest.java   |  676 ---
 .../server/handler/ConnectHandlerUnitTest.java     |   73 -
 .../handler/ContextHandlerCollectionTest.java      |  334 +-
 .../handler/ContextHandlerGetResourceTest.java     |  405 ++
 .../jetty/server/handler/ContextHandlerTest.java   |  368 +-
 .../jetty/server/handler/IPAccessHandlerTest.java  |  485 +-
 .../server/handler/RequestLogHandlerTest.java      |  569 +-
 .../server/handler/ResourceHandlerRangeTest.java   |  112 +
 .../jetty/server/handler/ResourceHandlerTest.java  |  201 +-
 .../jetty/server/handler/ScopedHandlerTest.java    |    5 -
 .../server/handler/SecuredRedirectHandlerTest.java |  288 +
 .../jetty/server/handler/ShutdownHandlerTest.java  |   26 +-
 .../server/handler/StatisticsHandlerTest.java      |  377 +-
 .../server/session/HashSessionManagerTest.java     |   91 +-
 .../jetty/server/session/SessionCookieTest.java    |  189 +-
 .../jetty/server/session/SessionHandlerTest.java   |  865 ---
 .../org/eclipse/jetty/server/ssl/SSLCloseTest.java |  109 +-
 .../eclipse/jetty/server/ssl/SSLEngineTest.java    |  119 +-
 .../ssl/SSLSelectChannelConnectorLoadTest.java     |   38 +-
 .../server/ssl/SelectChannelServerSslTest.java     |  161 +-
 .../jetty/server/ssl/SslRenegotiateTest.java       |  269 -
 .../server/ssl/SslSelectChannelTimeoutTest.java    |   37 +-
 .../jetty/server/ssl/SslSocketServerTest.java      |  110 -
 .../jetty/server/ssl/SslSocketTimeoutTest.java     |   69 -
 .../eclipse/jetty/server/ssl/SslUploadTest.java    |   39 +-
 .../src/test/resources/jetty-logging.properties    |    4 +-
 jetty-server/src/test/resources/simple/big.txt     |  400 ++
 jetty-servlet/pom.xml                              |   22 +-
 jetty-servlet/src/main/config/modules/servlet.mod  |    9 +
 .../java/org/eclipse/jetty/servlet/BaseHolder.java |  209 +
 .../org/eclipse/jetty/servlet/DefaultServlet.java  |  467 +-
 .../jetty/servlet/ErrorPageErrorHandler.java       |   40 +-
 .../org/eclipse/jetty/servlet/FilterHolder.java    |   73 +-
 .../org/eclipse/jetty/servlet/FilterMapping.java   |  109 +-
 .../java/org/eclipse/jetty/servlet/Holder.java     |  186 +-
 .../java/org/eclipse/jetty/servlet/Invoker.java    |  114 +-
 .../jetty/servlet/JspPropertyGroupServlet.java     |    2 -
 .../org/eclipse/jetty/servlet/ListenerHolder.java  |   65 +
 .../org/eclipse/jetty/servlet/NoJspServlet.java    |    4 +-
 .../jetty/servlet/ServletContextHandler.java       |  483 +-
 .../org/eclipse/jetty/servlet/ServletHandler.java  | 1039 ++--
 .../org/eclipse/jetty/servlet/ServletHolder.java   |  501 +-
 .../org/eclipse/jetty/servlet/ServletMapping.java  |    8 +-
 .../org/eclipse/jetty/servlet/ServletTester.java   |  259 +
 .../eclipse/jetty/servlet/StatisticsServlet.java   |  121 +-
 .../eclipse/jetty/servlet/jmx/package-info.java    |   23 +
 .../jetty/servlet/listener/ELContextCleaner.java   |   52 +-
 .../jetty/servlet/listener/package-info.java       |   23 +
 .../org/eclipse/jetty/servlet/package-info.java    |   23 +
 .../servlet/jmx/FilterMapping-mbean.properties     |    4 -
 .../jetty/servlet/jmx/Holder-mbean.properties      |    5 -
 .../jmx/ServletContextHandler-mbean.properties     |    4 -
 .../servlet/jmx/ServletHandler-mbean.properties    |    5 -
 .../servlet/jmx/ServletHolder-mbean.properties     |    4 -
 .../servlet/jmx/ServletMapping-mbean.properties    |    3 -
 .../AsyncContextDispatchWithQueryStrings.java      |  115 +-
 .../jetty/servlet/AsyncContextListenersTest.java   |  282 +
 .../eclipse/jetty/servlet/AsyncContextTest.java    |  101 +-
 .../eclipse/jetty/servlet/AsyncIOServletTest.java  |  560 ++
 .../eclipse/jetty/servlet/AsyncServletIOTest.java  |  596 +++
 .../jetty/servlet/AsyncServletLongPollTest.java    |  166 +
 .../eclipse/jetty/servlet/AsyncServletTest.java    |  343 +-
 .../jetty/servlet/DefaultServletRangesTest.java    |  265 +
 .../eclipse/jetty/servlet/DefaultServletTest.java  |  164 +-
 .../jetty/servlet/DispatcherForwardTest.java       |  518 ++
 .../org/eclipse/jetty/servlet/DispatcherTest.java  |  146 +-
 .../org/eclipse/jetty/servlet/ErrorPageTest.java   |    9 +-
 .../java/org/eclipse/jetty/servlet/HolderTest.java |   56 +-
 .../org/eclipse/jetty/servlet/InvokerTest.java     |    6 +-
 .../eclipse/jetty/servlet/RequestHeadersTest.java  |  125 +
 .../org/eclipse/jetty/servlet/RequestURITest.java  |  238 +
 .../eclipse/jetty/servlet/ResponseHeadersTest.java |  167 +
 .../jetty/servlet/SSLAsyncIOServletTest.java       |  179 +
 .../jetty/servlet/ServletContextHandlerTest.java   |  183 +-
 .../eclipse/jetty/servlet/ServletHandlerTest.java  |   19 +-
 .../jetty/servlet/ServletRequestLogTest.java       |  681 +++
 .../jetty/servlet/StatisticsServletTest.java       |  105 -
 .../src/test/resources/jetty-logging.properties    |    5 +
 .../src/test}/resources/keystore.jks               |  Bin
 .../src/test}/resources/truststore.jks             |  Bin
 jetty-servlets/pom.xml                             |   46 +-
 .../src/main/config/modules/servlets.mod           |   10 +
 .../eclipse/jetty/servlets/AsyncGzipFilter.java    |  572 ++
 .../eclipse/jetty/servlets/BalancerServlet.java    |  422 --
 .../main/java/org/eclipse/jetty/servlets/CGI.java  |  236 +-
 .../eclipse/jetty/servlets/CloseableDoSFilter.java |   22 +-
 .../org/eclipse/jetty/servlets/ConcatServlet.java  |  149 +-
 .../eclipse/jetty/servlets/CrossOriginFilter.java  |  120 +-
 .../jetty/servlets/DataRateLimitedServlet.java     |  315 ++
 .../java/org/eclipse/jetty/servlets/DoSFilter.java |  392 +-
 .../org/eclipse/jetty/servlets/EventSource.java    |  108 +
 .../eclipse/jetty/servlets/EventSourceServlet.java |  240 +
 .../org/eclipse/jetty/servlets/GzipFilter.java     |  371 +-
 .../jetty/servlets/IncludableGzipFilter.java       |   25 +-
 .../eclipse/jetty/servlets/MultiPartFilter.java    |  149 +-
 .../org/eclipse/jetty/servlets/ProxyServlet.java   |  908 ----
 .../java/org/eclipse/jetty/servlets/PutFilter.java |   70 +-
 .../java/org/eclipse/jetty/servlets/QoSFilter.java |  327 +-
 .../eclipse/jetty/servlets/UserAgentFilter.java    |    1 +
 .../org/eclipse/jetty/servlets/WelcomeFilter.java  |   13 +-
 .../servlets/gzip/AbstractCompressedStream.java    |  401 ++
 .../servlets/gzip/CompressedResponseWrapper.java   |  485 ++
 .../jetty/servlets/gzip/DeflatedOutputStream.java  |  101 +
 .../eclipse/jetty/servlets/gzip/GzipFactory.java   |   38 +
 .../eclipse/jetty/servlets/gzip/GzipHandler.java   |  404 ++
 .../jetty/servlets/gzip/GzipHttpOutput.java        |  405 ++
 .../jetty/servlets/gzip/GzipOutputStream.java      |   72 +
 .../eclipse/jetty/servlets/gzip/package-info.java  |   23 +
 .../org/eclipse/jetty/servlets/package-info.java   |   23 +
 .../jetty/servlets/jmx/DoSFilter-mbean.properties  |   18 -
 .../jetty/servlets/jmx/QoSFilter-mbean.properties  |    4 -
 .../servlets/AbstractBalancerServletTest.java      |  162 -
 .../jetty/servlets/AbstractDoSFilterTest.java      |   91 +-
 .../eclipse/jetty/servlets/AsyncProxyServer.java   |   53 -
 .../jetty/servlets/BalancerServletTest.java        |  135 -
 .../jetty/servlets/CloseableDoSFilterTest.java     |    7 +
 .../eclipse/jetty/servlets/ConcatServletTest.java  |  175 +
 .../jetty/servlets/CrossOriginFilterTest.java      |   76 +-
 .../jetty/servlets/DataRateLimitedServletTest.java |  109 +
 .../eclipse/jetty/servlets/DoSFilterJMXTest.java   |    7 +-
 .../org/eclipse/jetty/servlets/DoSFilterTest.java  |   25 +-
 .../jetty/servlets/EventSourceServletTest.java     |  350 ++
 .../servlets/GzipFilterContentLengthTest.java      |  339 +-
 .../GzipFilterDefaultNoRecompressTest.java         |   77 +-
 .../jetty/servlets/GzipFilterDefaultTest.java      |  586 ++-
 .../jetty/servlets/GzipFilterLayeredTest.java      |  211 +
 .../servlets/IncludableGzipFilterMinSizeTest.java  |   16 +-
 .../jetty/servlets/IncludableGzipFilterTest.java   |   71 +-
 .../jetty/servlets/MultipartFilterTest.java        |  386 +-
 .../org/eclipse/jetty/servlets/PipelineHelper.java |  306 --
 .../eclipse/jetty/servlets/ProxyServletTest.java   |  293 --
 .../org/eclipse/jetty/servlets/PutFilterTest.java  |   88 +-
 .../org/eclipse/jetty/servlets/QoSFilterTest.java  |  114 +-
 .../jetty/servlets/TransparentProxyTest.java       |  140 -
 .../jetty/servlets/gzip/AsyncManipFilter.java      |  103 +
 .../servlets/gzip/AsyncScheduledDispatchWrite.java |  121 +
 .../servlets/gzip/AsyncTimeoutCompleteWrite.java   |  137 +
 .../servlets/gzip/AsyncTimeoutDispatchWrite.java   |  121 +
 .../eclipse/jetty/servlets/gzip/GzipTester.java    |  511 +-
 .../jetty/servlets/gzip/PassThruInputStream.java   |   36 +
 .../jetty/servlets/gzip/TestDirContentServlet.java |    2 +-
 .../servlets/gzip/TestMinGzipSizeServlet.java      |    9 +-
 .../gzip/TestServletBufferTypeLengthWrite.java     |   67 +
 .../gzip/TestServletLengthStreamTypeWrite.java     |    8 +-
 .../gzip/TestServletLengthTypeStreamWrite.java     |    8 +-
 .../gzip/TestServletStreamLengthTypeWrite.java     |    8 +-
 .../TestServletStreamLengthTypeWriteWithFlush.java |    2 -
 .../gzip/TestServletStreamTypeLengthWrite.java     |    8 +-
 .../gzip/TestServletTypeLengthStreamWrite.java     |    8 +-
 .../gzip/TestServletTypeStreamLengthWrite.java     |    8 +-
 .../servlets/gzip/TestStaticMimeTypeServlet.java   |   13 +-
 .../src/test/resources/jetty-logging.properties    |    7 +
 .../src/test/resources/lots-of-fantasy-names.txt   | 3000 -----------
 .../test/resources/lots-of-fantasy-names.txt.sha1  |    1 -
 jetty-servlets/src/test/resources/test.svg         | 2101 ++++++++
 jetty-servlets/src/test/resources/test.svg.sha1    |    1 +
 jetty-servlets/src/test/resources/test.svgz        |  Bin 0 -> 6916 bytes
 jetty-servlets/src/test/resources/test.svgz.sha1   |    1 +
 jetty-spdy/pom.xml                                 |  271 +-
 jetty-spdy/spdy-alpn-tests/pom.xml                 |   93 +
 .../jetty/spdy/server/ALPNNegotiationTest.java     |  198 +
 .../jetty/spdy/server/ALPNSynReplyTest.java        |  149 +
 .../jetty/spdy/server/AbstractALPNTest.java        |   78 +
 .../src/test/resources/jetty-logging.properties    |    2 +
 .../src/test}/resources/keystore.jks               |  Bin
 .../src/test}/resources/truststore.jks             |  Bin
 jetty-spdy/spdy-client/pom.xml                     |   66 +
 .../spdy/client/FlowControlStrategyFactory.java    |   43 +
 .../jetty/spdy/client/NPNClientConnection.java     |   82 +
 .../spdy/client/NPNClientConnectionFactory.java    |   50 +
 .../org/eclipse/jetty/spdy/client/SPDYClient.java  |  440 ++
 .../spdy/client/SPDYClientConnectionFactory.java   |   98 +
 .../eclipse/jetty/spdy/client/SPDYConnection.java  |  191 +
 jetty-spdy/spdy-core/pom.xml                       |   35 +-
 .../org/eclipse/jetty/spdy/ByteBufferPool.java     |   51 -
 .../java/org/eclipse/jetty/spdy/Controller.java    |    6 +-
 .../main/java/org/eclipse/jetty/spdy/Flusher.java  |  266 +
 .../main/java/org/eclipse/jetty/spdy/ISession.java |   17 +-
 .../main/java/org/eclipse/jetty/spdy/IStream.java  |    8 +-
 .../main/java/org/eclipse/jetty/spdy/Promise.java  |  102 -
 .../java/org/eclipse/jetty/spdy/PushSynInfo.java   |    5 +-
 .../jetty/spdy/SPDYv3FlowControlStrategy.java      |    3 +-
 .../eclipse/jetty/spdy/StandardByteBufferPool.java |  102 -
 .../org/eclipse/jetty/spdy/StandardSession.java    |  829 ++-
 .../org/eclipse/jetty/spdy/StandardStream.java     |  246 +-
 .../eclipse/jetty/spdy/api/ByteBufferDataInfo.java |   17 +-
 .../org/eclipse/jetty/spdy/api/BytesDataInfo.java  |   21 +-
 .../java/org/eclipse/jetty/spdy/api/DataInfo.java  |   93 +-
 .../org/eclipse/jetty/spdy/api/GoAwayInfo.java     |   37 +-
 .../eclipse/jetty/spdy/api/GoAwayResultInfo.java   |   57 +
 .../java/org/eclipse/jetty/spdy/api/Handler.java   |   61 -
 .../java/org/eclipse/jetty/spdy/api/Headers.java   |  305 --
 .../org/eclipse/jetty/spdy/api/HeadersInfo.java    |   50 +-
 .../main/java/org/eclipse/jetty/spdy/api/Info.java |   52 +
 .../java/org/eclipse/jetty/spdy/api/PingInfo.java  |   24 +-
 .../org/eclipse/jetty/spdy/api/PingResultInfo.java |   44 +
 .../java/org/eclipse/jetty/spdy/api/PushInfo.java  |  101 +
 .../java/org/eclipse/jetty/spdy/api/ReplyInfo.java |   34 +-
 .../java/org/eclipse/jetty/spdy/api/RstInfo.java   |   22 +-
 .../java/org/eclipse/jetty/spdy/api/Session.java   |  112 +-
 .../jetty/spdy/api/SessionFrameListener.java       |   22 +-
 .../java/org/eclipse/jetty/spdy/api/Settings.java  |   17 +-
 .../org/eclipse/jetty/spdy/api/SettingsInfo.java   |   14 +-
 .../java/org/eclipse/jetty/spdy/api/Stream.java    |  151 +-
 .../jetty/spdy/api/StreamFrameListener.java        |   27 +
 .../org/eclipse/jetty/spdy/api/StringDataInfo.java |   10 +-
 .../java/org/eclipse/jetty/spdy/api/SynInfo.java   |   54 +-
 .../org/eclipse/jetty/spdy/frames/DataFrame.java   |    7 +-
 .../eclipse/jetty/spdy/frames/HeadersFrame.java    |    8 +-
 .../eclipse/jetty/spdy/frames/SynReplyFrame.java   |    8 +-
 .../eclipse/jetty/spdy/frames/SynStreamFrame.java  |    8 +-
 .../spdy/generator/ControlFrameGenerator.java      |    2 +-
 .../jetty/spdy/generator/CredentialGenerator.java  |    6 +-
 .../jetty/spdy/generator/DataFrameGenerator.java   |    7 +-
 .../eclipse/jetty/spdy/generator/Generator.java    |    3 +-
 .../jetty/spdy/generator/GoAwayGenerator.java      |    6 +-
 .../spdy/generator/HeadersBlockGenerator.java      |   28 +-
 .../jetty/spdy/generator/HeadersGenerator.java     |    6 +-
 .../jetty/spdy/generator/NoOpGenerator.java        |    6 +-
 .../jetty/spdy/generator/PingGenerator.java        |    6 +-
 .../jetty/spdy/generator/RstStreamGenerator.java   |    6 +-
 .../jetty/spdy/generator/SettingsGenerator.java    |    6 +-
 .../jetty/spdy/generator/SynReplyGenerator.java    |    6 +-
 .../jetty/spdy/generator/SynStreamGenerator.java   |    6 +-
 .../spdy/generator/WindowUpdateGenerator.java      |    6 +-
 .../jetty/spdy/parser/ControlFrameParser.java      |   38 +-
 .../jetty/spdy/parser/HeadersBlockParser.java      |   17 +-
 .../jetty/spdy/parser/HeadersBodyParser.java       |    6 +-
 .../java/org/eclipse/jetty/spdy/parser/Parser.java |   71 +-
 .../jetty/spdy/parser/SynReplyBodyParser.java      |    6 +-
 .../jetty/spdy/parser/SynStreamBodyParser.java     |   39 +-
 .../org/eclipse/jetty/spdy/AsyncTimeoutTest.java   |   79 +-
 .../eclipse/jetty/spdy/StandardSessionTest.java    |  439 +-
 .../org/eclipse/jetty/spdy/StandardStreamTest.java |  178 +-
 .../eclipse/jetty/spdy/api/ClientUsageTest.java    |  240 +-
 .../eclipse/jetty/spdy/api/ServerUsageTest.java    |   37 +-
 .../spdy/frames/CredentialGenerateParseTest.java   |    6 +-
 .../jetty/spdy/frames/DataGenerateParseTest.java   |    8 +-
 .../jetty/spdy/frames/GoAwayGenerateParseTest.java |    6 +-
 .../spdy/frames/HeadersGenerateParseTest.java      |   26 +-
 .../jetty/spdy/frames/NoOpGenerateParseTest.java   |    6 +-
 .../jetty/spdy/frames/PingGenerateParseTest.java   |    6 +-
 .../spdy/frames/RstStreamGenerateParseTest.java    |    6 +-
 .../spdy/frames/SettingsGenerateParseTest.java     |    6 +-
 .../spdy/frames/SynReplyGenerateParseTest.java     |   12 +-
 .../spdy/frames/SynStreamGenerateParseTest.java    |   12 +-
 .../spdy/frames/WindowUpdateGenerateParseTest.java |    6 +-
 .../spdy/generator/DataFrameGeneratorTest.java     |  110 +
 .../eclipse/jetty/spdy/parser/BrokenFrameTest.java |  287 +
 .../spdy/parser/ParseVersusCacheBenchmarkTest.java |   13 +-
 .../jetty/spdy/parser/UnknownControlFrameTest.java |    8 +-
 .../src/test/resources/jetty-logging.properties    |    2 +
 .../spdy-core/src/test/resources/log4j.properties  |   14 -
 jetty-spdy/spdy-example-webapp/pom.xml             |   84 +
 .../src/main/config/example-jetty-spdy-proxy.xml   |  147 +
 .../src/main/config/example-jetty-spdy.xml         |  138 +
 .../src/main/resources/jetty-logging.properties    |    2 +
 .../src/main/resources/keystore.jks                |  Bin
 .../src/main/resources/truststore.jks              |  Bin
 .../src/main/webapp/WEB-INF/web.xml                |    6 +
 .../src/main/webapp/form.jsp                       |    0
 .../src/main/webapp/included.jsp                   |    0
 .../src/main/webapp/index.jsp                      |    0
 .../src/main/webapp/logo.jpg                       |  Bin
 .../src/main/webapp/stylesheet.css                 |    0
 jetty-spdy/spdy-http-client-transport/pom.xml      |   71 +
 .../spdy/client/http/HttpChannelOverSPDY.java      |   78 +
 .../client/http/HttpClientTransportOverSPDY.java   |  107 +
 .../spdy/client/http/HttpConnectionOverSPDY.java   |   82 +
 .../spdy/client/http/HttpDestinationOverSPDY.java  |   38 +
 .../spdy/client/http/HttpReceiverOverSPDY.java     |  152 +
 .../jetty/spdy/client/http/HttpSenderOverSPDY.java |  118 +
 .../client/http/AbstractHttpClientServerTest.java  |  107 +
 .../jetty/spdy/client/http/EmptyServerHandler.java |   37 +
 .../client/http/HttpClientCustomProxyTest.java     |  262 +
 .../jetty/spdy/client/http/HttpClientTest.java     |  467 ++
 .../src/test/resources/jetty-logging.properties    |    4 +
 .../src/test}/resources/keystore.jks               |  Bin
 .../src/test}/resources/truststore.jks             |  Bin
 jetty-spdy/spdy-http-common/pom.xml                |   48 +
 .../eclipse/jetty/spdy/http/HTTPSPDYHeader.java    |   82 +
 jetty-spdy/spdy-http-server/pom.xml                |  120 +
 .../src/main/config/etc/jetty-spdy-proxy.xml       |  158 +
 .../src/main/config/etc/jetty-spdy.xml             |  139 +
 .../src/main/config/etc/protonego-npn.xml          |   21 +
 .../config/modules/protonego-impl/npn-1.7.0_04.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_05.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_06.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_07.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_09.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_10.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_11.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_13.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_15.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_17.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_21.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_25.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_40.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_45.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_51.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_55.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_60.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_65.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_67.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_71.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_72.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_75.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_76.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_79.mod |    8 +
 .../config/modules/protonego-impl/npn-1.7.0_80.mod |    8 +
 .../src/main/config/modules/protonego-impl/npn.mod |   37 +
 .../src/main/config/modules/spdy.mod               |   26 +
 .../http/HTTPSPDYServerConnectionFactory.java      |  167 +
 .../spdy/server/http/HTTPSPDYServerConnector.java  |   82 +
 .../spdy/server/http/HttpChannelOverSPDY.java      |  246 +
 .../jetty/spdy/server/http/HttpInputOverSPDY.java  |   49 +
 .../spdy/server/http/HttpTransportOverSPDY.java    |  423 ++
 .../jetty/spdy/server/http/PushStrategy.java       |   55 +
 .../spdy/server/http/ReferrerPushStrategy.java     |  342 ++
 .../jetty/spdy/server/proxy/HTTPProxyEngine.java   |  276 +
 .../server/proxy/HTTPSPDYProxyServerConnector.java |   63 +
 .../jetty/spdy/server/proxy/ProxyEngine.java       |  129 +
 .../spdy/server/proxy/ProxyEngineSelector.java     |  203 +
 .../server/proxy/ProxyHTTPConnectionFactory.java   |   57 +
 .../spdy/server/proxy/ProxyHTTPSPDYConnection.java |  385 ++
 .../jetty/spdy/server/proxy/SPDYProxyEngine.java   |  631 +++
 .../spdy/server/http/AbstractHTTPSPDYTest.java     |  136 +
 .../spdy/server/http/ConcurrentStreamsTest.java    |  128 +
 .../server/http/HttpTransportOverSPDYTest.java     |  288 +
 .../server/http/PushStrategyBenchmarkTest.java     |  397 ++
 .../spdy/server/http/ReferrerPushStrategyTest.java | 1138 ++++
 .../server/http/ReferrerPushStrategyUnitTest.java  |  149 +
 .../jetty/spdy/server/http/SPDYTestUtils.java      |   51 +
 .../spdy/server/http/SSLExternalServerTest.java    |  108 +
 .../jetty/spdy/server/http/ServerHTTPSPDYTest.java | 1625 ++++++
 .../spdy/server/http/SimpleHTTPBenchmarkTest.java  |  160 +
 .../spdy/server/proxy/ProxyHTTPToSPDYTest.java     |  408 ++
 .../spdy/server/proxy/ProxySPDYToHTTPLoadTest.java |  319 ++
 .../spdy/server/proxy/ProxySPDYToHTTPTest.java     |  545 ++
 .../spdy/server/proxy/ProxySPDYToSPDYLoadTest.java |  275 +
 .../spdy/server/proxy/ProxySPDYToSPDYTest.java     |  553 ++
 .../src/test/resources/big_script.js               |  791 +++
 .../src/test/resources/jetty-logging.properties    |   10 +
 .../src/test}/resources/keystore.jks               |  Bin
 .../src/test}/resources/truststore.jks             |  Bin
 jetty-spdy/spdy-jetty-http-webapp/pom.xml          |  104 -
 .../src/main/config/etc/jetty-spdy-proxy.xml       |   98 -
 .../src/main/config/etc/jetty-spdy.xml             |   86 -
 .../src/main/resources/log4j.properties            |   16 -
 .../src/main/webapp/WEB-INF/web.xml                |    6 -
 jetty-spdy/spdy-jetty-http/pom.xml                 |   82 -
 .../spdy/http/AbstractHTTPSPDYServerConnector.java |   66 -
 .../eclipse/jetty/spdy/http/HTTPSPDYHeader.java    |   78 -
 .../jetty/spdy/http/HTTPSPDYServerConnector.java   |   69 -
 .../org/eclipse/jetty/spdy/http/PushStrategy.java  |   43 -
 .../jetty/spdy/http/ReferrerPushStrategy.java      |  285 -
 .../http/ServerHTTPAsyncConnectionFactory.java     |   49 -
 .../spdy/http/ServerHTTPSPDYAsyncConnection.java   |  794 ---
 .../http/ServerHTTPSPDYAsyncConnectionFactory.java |  188 -
 .../jetty/spdy/proxy/HTTPSPDYProxyConnector.java   |   44 -
 .../org/eclipse/jetty/spdy/proxy/ProxyEngine.java  |   99 -
 .../jetty/spdy/proxy/ProxyEngineSelector.java      |  187 -
 .../proxy/ProxyHTTPAsyncConnectionFactory.java     |   46 -
 .../spdy/proxy/ProxyHTTPSPDYAsyncConnection.java   |  343 --
 .../eclipse/jetty/spdy/proxy/SPDYProxyEngine.java  |  519 --
 .../jetty/spdy/http/AbstractHTTPSPDYTest.java      |  124 -
 .../jetty/spdy/http/ConcurrentStreamsTest.java     |  118 -
 .../jetty/spdy/http/ProtocolNegotiationTest.java   |  254 -
 .../jetty/spdy/http/PushStrategyBenchmarkTest.java |  400 --
 .../spdy/http/ReferrerPushStrategyUnitTest.java    |  124 -
 .../spdy/http/ReferrerPushStrategyV2Test.java      |  802 ---
 .../spdy/http/ReferrerPushStrategyV3Test.java      |   31 -
 .../jetty/spdy/http/SSLExternalServerTest.java     |  101 -
 .../jetty/spdy/http/ServerHTTPSPDYv2Test.java      | 1277 -----
 .../jetty/spdy/http/ServerHTTPSPDYv3Test.java      |   31 -
 .../jetty/spdy/proxy/ProxyHTTPSPDYv2Test.java      |  769 ---
 .../src/test/resources/log4j.properties            |   14 -
 jetty-spdy/spdy-jetty/pom.xml                      |   82 -
 .../eclipse/jetty/spdy/AsyncConnectionFactory.java |   30 -
 .../eclipse/jetty/spdy/EmptyAsyncConnection.java   |   68 -
 .../org/eclipse/jetty/spdy/EmptyAsyncEndPoint.java |  234 -
 .../jetty/spdy/FlowControlStrategyFactory.java     |   42 -
 .../eclipse/jetty/spdy/SPDYAsyncConnection.java    |  247 -
 .../java/org/eclipse/jetty/spdy/SPDYClient.java    |  494 --
 .../eclipse/jetty/spdy/SPDYServerConnector.java    |  330 --
 .../spdy/ServerSPDYAsyncConnectionFactory.java     |  125 -
 .../java/org/eclipse/jetty/spdy/AbstractTest.java  |  128 -
 .../org/eclipse/jetty/spdy/ClosedStreamTest.java   |  269 -
 .../org/eclipse/jetty/spdy/FlowControlTest.java    |  490 --
 .../java/org/eclipse/jetty/spdy/GoAwayTest.java    |  230 -
 .../java/org/eclipse/jetty/spdy/HeadersTest.java   |   85 -
 .../org/eclipse/jetty/spdy/IdleTimeoutTest.java    |  253 -
 .../test/java/org/eclipse/jetty/spdy/PingTest.java |   93 -
 .../eclipse/jetty/spdy/ProtocolViolationsTest.java |  181 -
 .../org/eclipse/jetty/spdy/PushStreamTest.java     |  560 --
 .../org/eclipse/jetty/spdy/ResetStreamTest.java    |  202 -
 .../eclipse/jetty/spdy/SPDYClientFactoryTest.java  |   69 -
 .../jetty/spdy/SPDYServerConnectorTest.java        |   69 -
 .../org/eclipse/jetty/spdy/SSLEngineLeakTest.java  |   78 -
 .../org/eclipse/jetty/spdy/SSLSynReplyTest.java    |   50 -
 .../java/org/eclipse/jetty/spdy/SettingsTest.java  |  167 -
 .../jetty/spdy/SynDataReplyDataLoadTest.java       |  224 -
 .../java/org/eclipse/jetty/spdy/SynReplyTest.java  |  372 --
 .../eclipse/jetty/spdy/UnsupportedVersionTest.java |   97 -
 .../spdy-jetty/src/test/resources/log4j.properties |   14 -
 jetty-spdy/spdy-npn-tests/pom.xml                  |   93 +
 .../eclipse/jetty/spdy/server/AbstractNPNTest.java |   77 +
 .../eclipse/jetty/spdy/server/NPNModuleTest.java   |  193 +
 .../jetty/spdy/server/NPNNegotiationTest.java      |  207 +
 .../jetty/spdy/server/SSLEngineLeakTest.java       |   71 +
 .../eclipse/jetty/spdy/server/SSLSynReplyTest.java |  150 +
 .../server/proxy/NPNProxySPDYToHTTPLoadTest.java   |   29 +
 .../spdy/server/proxy/NPNProxySPDYToHTTPTest.java  |   27 +
 .../server/proxy/NPNProxySPDYToSPDYLoadTest.java   |   27 +
 .../spdy/server/proxy/NPNProxySPDYToSPDYTest.java  |   27 +
 .../src/test/resources/jetty-logging.properties    |    2 +
 .../src/test}/resources/keystore.jks               |  Bin
 .../src/test}/resources/truststore.jks             |  Bin
 jetty-spdy/spdy-server/pom.xml                     |   72 +
 .../jetty/spdy/server/NPNServerConnection.java     |   68 +
 .../spdy/server/NPNServerConnectionFactory.java    |   61 +
 .../spdy/server/SPDYServerConnectionFactory.java   |  245 +
 .../jetty/spdy/server/SPDYServerConnector.java     |   52 +
 .../eclipse/jetty/spdy/server/AbstractTest.java    |  150 +
 .../jetty/spdy/server/ClosedStreamTest.java        |  273 +
 .../eclipse/jetty/spdy/server/FlowControlTest.java |  493 ++
 .../org/eclipse/jetty/spdy/server/GoAwayTest.java  |  234 +
 .../org/eclipse/jetty/spdy/server/HeadersTest.java |   86 +
 .../eclipse/jetty/spdy/server/IdleTimeoutTest.java |  257 +
 .../jetty/spdy/server/MaxConcurrentStreamTest.java |  121 +
 .../org/eclipse/jetty/spdy/server/PingTest.java    |  106 +
 .../jetty/spdy/server/ProtocolViolationsTest.java  |  185 +
 .../eclipse/jetty/spdy/server/PushStreamTest.java  |  591 +++
 .../eclipse/jetty/spdy/server/ResetStreamTest.java |  204 +
 .../jetty/spdy/server/SPDYClientFactoryTest.java   |   75 +
 .../jetty/spdy/server/SPDYServerConnectorTest.java |   70 +
 .../eclipse/jetty/spdy/server/SettingsTest.java    |  168 +
 .../spdy/server/SynDataReplyDataLoadTest.java      |  288 +
 .../eclipse/jetty/spdy/server/SynReplyTest.java    |  375 ++
 .../jetty/spdy/server/UnsupportedVersionTest.java  |  100 +
 .../src/test/resources/jetty-logging.properties    |    2 +
 jetty-spring/pom.xml                               |   66 +
 jetty-spring/src/main/config/etc/jetty-spring.xml  |   61 +
 jetty-spring/src/main/config/modules/spring.mod    |   16 +
 .../main/java/org/eclipse/jetty/spring/Main.java   |   34 +
 .../jetty/spring/SpringConfigurationProcessor.java |  164 +
 .../SpringConfigurationProcessorFactory.java       |   42 +
 .../org/eclipse/jetty/spring/package-info.java     |   23 +
 ...eclipse.jetty.xml.ConfigurationProcessorFactory |    1 +
 .../jetty/spring/SpringXmlConfigurationTest.java   |  162 +
 .../eclipse/jetty/spring/TestConfiguration.java    |  155 +
 .../org/eclipse/jetty/spring/configure.xml         |   34 +
 .../resources/org/eclipse/jetty/spring/jetty.xml   |   42 +
 jetty-start/pom.xml                                |    2 +-
 .../java/org/eclipse/jetty/start/BaseHome.java     |  475 ++
 .../java/org/eclipse/jetty/start/Classpath.java    |  189 +-
 .../eclipse/jetty/start/CommandLineBuilder.java    |  139 +-
 .../main/java/org/eclipse/jetty/start/Config.java  | 1002 ----
 .../src/main/java/org/eclipse/jetty/start/FS.java  |  166 +
 .../main/java/org/eclipse/jetty/start/FileArg.java |  127 +
 .../eclipse/jetty/start/FilenameComparator.java    |   70 -
 .../java/org/eclipse/jetty/start/JarVersion.java   |   59 +-
 .../main/java/org/eclipse/jetty/start/Main.java    | 1565 +++---
 .../main/java/org/eclipse/jetty/start/Module.java  |  494 ++
 .../org/eclipse/jetty/start/ModuleGraphWriter.java |  260 +
 .../main/java/org/eclipse/jetty/start/Modules.java |  678 +++
 .../java/org/eclipse/jetty/start/NaturalSort.java  |   70 +
 .../java/org/eclipse/jetty/start/PathFinder.java   |  169 +
 .../java/org/eclipse/jetty/start/PathMatchers.java |  259 +
 .../main/java/org/eclipse/jetty/start/Props.java   |  376 ++
 .../org/eclipse/jetty/start/PropsException.java    |   41 +
 .../main/java/org/eclipse/jetty/start/README.TXT   |   48 +
 .../main/java/org/eclipse/jetty/start/README.txt   |   47 -
 .../main/java/org/eclipse/jetty/start/RawArgs.java |   97 +
 .../java/org/eclipse/jetty/start/StartArgs.java    | 1046 ++++
 .../java/org/eclipse/jetty/start/StartIni.java     |   74 +
 .../java/org/eclipse/jetty/start/StartLog.java     |  195 +
 .../java/org/eclipse/jetty/start/TextFile.java     |  127 +
 .../org/eclipse/jetty/start/UsageException.java    |   50 +
 .../main/java/org/eclipse/jetty/start/Version.java |  125 +-
 .../start/config/CommandLineConfigSource.java      |  245 +
 .../eclipse/jetty/start/config/ConfigSource.java   |   75 +
 .../eclipse/jetty/start/config/ConfigSources.java  |  164 +
 .../jetty/start/config/DirConfigSource.java        |  256 +
 .../jetty/start/config/JettyBaseConfigSource.java  |   36 +
 .../jetty/start/config/JettyHomeConfigSource.java  |   36 +
 .../java/org/eclipse/jetty/start/package-info.java |   23 +
 .../org/eclipse/jetty/start/base-home-warning.txt  |   16 +
 .../resources/org/eclipse/jetty/start/start.config |  161 -
 .../resources/org/eclipse/jetty/start/usage.txt    |  247 +-
 .../java/org/eclipse/jetty/start/BaseHomeTest.java |  211 +
 .../jetty/start/CommandLineBuilderTest.java        |   12 +-
 .../java/org/eclipse/jetty/start/ConfigTest.java   |  649 ---
 .../eclipse/jetty/start/ConfigurationAssert.java   |  281 +
 .../test/java/org/eclipse/jetty/start/FSTest.java  |   62 +
 .../java/org/eclipse/jetty/start/FileArgTest.java  |  100 +
 .../eclipse/jetty/start/IncludeJettyDirTest.java   |  559 ++
 .../org/eclipse/jetty/start/JarVersionTest.java    |   54 +
 .../java/org/eclipse/jetty/start/LicenseTest.java  |  181 +
 .../java/org/eclipse/jetty/start/MainTest.java     |  221 +-
 .../eclipse/jetty/start/ModuleGraphWriterTest.java |   74 +
 .../java/org/eclipse/jetty/start/ModuleTest.java   |   70 +
 .../java/org/eclipse/jetty/start/ModulesTest.java  |  334 ++
 .../org/eclipse/jetty/start/PathFinderTest.java    |   88 +
 .../jetty/start/PathMatchersAbsoluteTest.java      |   82 +
 .../jetty/start/PathMatchersSearchRootTest.java    |   89 +
 .../java/org/eclipse/jetty/start/PropertyDump.java |   74 +
 .../eclipse/jetty/start/PropertyPassingTest.java   |  214 +
 .../java/org/eclipse/jetty/start/PropsTest.java    |  140 +
 .../eclipse/jetty/start/RebuildTestResources.java  |  190 +
 .../eclipse/jetty/start/SystemExitAsException.java |   79 +
 .../org/eclipse/jetty/start/TestBadUseCases.java   |   85 +
 .../test/java/org/eclipse/jetty/start/TestEnv.java |   52 +
 .../java/org/eclipse/jetty/start/TestUseCases.java |  135 +
 .../java/org/eclipse/jetty/start/VersionTest.java  |    4 +-
 .../jetty/start/config/ConfigSourcesTest.java      |  599 +++
 .../src/test/resources/assert-home-with-jvm.txt    |   44 +
 .../src/test/resources/assert-home-with-spaces.txt |   11 +
 .../src/test/resources/assert-home-with-spdy.txt   |   72 +
 jetty-start/src/test/resources/assert-home.txt     |   37 +
 .../src/test/resources/bad-libs/no-manifest.jar    |  Bin 0 -> 3286 bytes
 jetty-start/src/test/resources/bad-libs/not-a.jar  |  Bin 0 -> 3142 bytes
 .../lib/JSR.ZIP => bad-libs/zero-length.jar}       |    0
 jetty-start/src/test/resources/bogus.xml           |    2 +
 .../etc/example-quickstart.xml}                    |    0
 .../lib/example.jar => dist-home/etc/hawtio.xml}   |    0
 .../etc/home-base-warning.xml}                     |    0
 .../lib/spec.zip => dist-home/etc/jamon.xml}       |    0
 .../resources/dist-home/etc/jetty-annotations.xml  |    0
 .../src/test/resources/dist-home/etc/jetty-cdi.xml |    0
 .../test/resources/dist-home/etc/jetty-debug.xml   |    0
 .../test/resources/dist-home/etc/jetty-deploy.xml  |    0
 .../test/resources/dist-home/etc/jetty-http.xml    |    0
 .../test/resources/dist-home/etc/jetty-https.xml   |    0
 .../resources/dist-home/etc/jetty-ipaccess.xml     |    0
 .../test/resources/dist-home/etc/jetty-jaas.xml    |    0
 .../resources/dist-home/etc/jetty-jmx-remote.xml   |    0
 .../src/test/resources/dist-home/etc/jetty-jmx.xml |    0
 .../test/resources/dist-home/etc/jetty-logging.xml |    0
 .../resources/dist-home/etc/jetty-lowresources.xml |    0
 .../test/resources/dist-home/etc/jetty-monitor.xml |    0
 .../test/resources/dist-home/etc/jetty-plus.xml    |    0
 .../test/resources/dist-home/etc/jetty-proxy.xml   |    0
 .../resources/dist-home/etc/jetty-requestlog.xml   |    0
 .../test/resources/dist-home/etc/jetty-rewrite.xml |    0
 .../test/resources/dist-home/etc/jetty-setuid.xml  |    0
 .../resources/dist-home/etc/jetty-spdy-proxy.xml   |    0
 .../test/resources/dist-home/etc/jetty-spdy.xml    |    0
 .../test/resources/dist-home/etc/jetty-spring.xml  |    0
 .../src/test/resources/dist-home/etc/jetty-ssl.xml |    0
 .../test/resources/dist-home/etc/jetty-started.xml |    0
 .../test/resources/dist-home/etc/jetty-stats.xml   |    0
 .../test/resources/dist-home/etc/jetty-xinetd.xml  |    0
 .../src/test/resources/dist-home/etc/jetty.xml     |    0
 .../src/test/resources/dist-home/etc/jminix.xml    |    0
 .../src/test/resources/dist-home/etc/jolokia.xml   |    0
 .../resources/dist-home/etc/protonego-alpn.xml     |    0
 .../test/resources/dist-home/etc/protonego-npn.xml |    0
 .../test/resources/dist-home/etc/webdefault.xml    |    0
 .../dist-home/lib/annotations/asm-5.0.1.jar        |    0
 .../lib/annotations/asm-commons-5.0.1.jar          |    0
 .../lib/annotations/javax.annotation-api-1.2.jar   |    0
 .../org.eclipse.jetty.apache-jsp-TEST.jar          |    0
 ....orbit.org.eclipse.jdt.core-3.8.2.v20130121.jar |    0
 .../org.mortbay.jasper.apache-el-8.0.9.M3.jar      |    0
 .../org.mortbay.jasper.apache-jsp-8.0.9.M3.jar     |    0
 ....apache.taglibs.taglibs-standard-impl-1.2.1.jar |    0
 ....apache.taglibs.taglibs-standard-spec-1.2.1.jar |    0
 .../dist-home/lib/fcgi/fcgi-client-TEST.jar        |    0
 .../dist-home/lib/fcgi/fcgi-server-TEST.jar        |    0
 ...x.security.auth.message-1.0.0.v201108011116.jar |    0
 .../dist-home/lib/jetty-alpn-client-TEST.jar       |    0
 .../dist-home/lib/jetty-alpn-server-TEST.jar       |    0
 .../dist-home/lib/jetty-annotations-TEST.jar       |    0
 .../resources/dist-home/lib/jetty-cdi-TEST.jar     |    0
 .../resources/dist-home/lib/jetty-client-TEST.jar  |    0
 .../dist-home/lib/jetty-continuation-TEST.jar      |    0
 .../resources/dist-home/lib/jetty-deploy-TEST.jar  |    0
 .../resources/dist-home/lib/jetty-http-TEST.jar    |    0
 .../test/resources/dist-home/lib/jetty-io-TEST.jar |    0
 .../resources/dist-home/lib/jetty-jaas-TEST.jar    |    0
 .../resources/dist-home/lib/jetty-jaspi-TEST.jar   |    0
 .../resources/dist-home/lib/jetty-jmx-TEST.jar     |    0
 .../resources/dist-home/lib/jetty-jndi-TEST.jar    |    0
 .../resources/dist-home/lib/jetty-plus-TEST.jar    |    0
 .../resources/dist-home/lib/jetty-proxy-TEST.jar   |    0
 .../dist-home/lib/jetty-quickstart-TEST.jar        |    0
 .../resources/dist-home/lib/jetty-rewrite-TEST.jar |    0
 .../resources/dist-home/lib/jetty-schemas-3.1.jar  |    0
 .../dist-home/lib/jetty-security-TEST.jar          |    0
 .../resources/dist-home/lib/jetty-server-TEST.jar  |    0
 .../resources/dist-home/lib/jetty-servlet-TEST.jar |    0
 .../dist-home/lib/jetty-servlets-TEST.jar          |    0
 .../resources/dist-home/lib/jetty-util-TEST.jar    |    0
 .../resources/dist-home/lib/jetty-webapp-TEST.jar  |    0
 .../resources/dist-home/lib/jetty-xml-TEST.jar     |    0
 .../javax.mail.glassfish-1.4.1.v201005082020.jar   |    0
 .../lib/jndi/javax.transaction-api-1.2.jar         |    0
 .../resources/dist-home/lib/jsp/javax.el-3.0.0.jar |    0
 .../dist-home/lib/jsp/javax.servlet.jsp-2.3.2.jar  |    0
 .../lib/jsp/javax.servlet.jsp-api-2.3.1.jar        |    0
 .../lib/jsp/javax.servlet.jsp.jstl-1.2.2.jar       |    0
 .../dist-home/lib/jsp/jetty-jsp-jdt-2.3.3.jar      |    0
 .../jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar   |    0
 ....javax.servlet.jsp.jstl-1.2.0.v201105211821.jar |    0
 .../dist-home/lib/monitor/jetty-monitor-TEST.jar   |    0
 .../resources/dist-home/lib/servlet-api-3.1.jar    |    0
 .../lib/setuid/jetty-setuid-java-1.0.1.jar         |    0
 .../dist-home/lib/spdy/spdy-client-TEST.jar        |    0
 .../dist-home/lib/spdy/spdy-core-TEST.jar          |    0
 .../dist-home/lib/spdy/spdy-http-common-TEST.jar   |    0
 .../dist-home/lib/spdy/spdy-http-server-TEST.jar   |    0
 .../dist-home/lib/spdy/spdy-server-TEST.jar        |    0
 .../dist-home/lib/spring/jetty-spring-TEST.jar     |    0
 .../websocket/javax-websocket-client-impl-TEST.jar |    0
 .../websocket/javax-websocket-server-impl-TEST.jar |    0
 .../lib/websocket/javax.websocket-api-1.0.jar      |    0
 .../dist-home/lib/websocket/websocket-api-TEST.jar |    0
 .../lib/websocket/websocket-client-TEST.jar        |    0
 .../lib/websocket/websocket-common-TEST.jar        |    0
 .../lib/websocket/websocket-server-TEST.jar        |    0
 .../lib/websocket/websocket-servlet-TEST.jar       |    0
 .../resources/dist-home/modules/annotations.mod    |   17 +
 .../src/test/resources/dist-home/modules/cdi.mod   |   26 +
 .../test/resources/dist-home/modules/client.mod    |    6 +
 .../resources/dist-home/modules/continuation.mod   |    6 +
 .../src/test/resources/dist-home/modules/debug.mod |    9 +
 .../test/resources/dist-home/modules/deploy.mod    |   21 +
 .../src/test/resources/dist-home/modules/ext.mod   |   11 +
 .../src/test/resources/dist-home/modules/fcgi.mod  |   15 +
 .../test/resources/dist-home/modules/hawtio.mod    |   28 +
 .../dist-home/modules/home-base-warning.mod        |    7 +
 .../src/test/resources/dist-home/modules/http.mod  |   27 +
 .../src/test/resources/dist-home/modules/https.mod |   19 +
 .../test/resources/dist-home/modules/ipaccess.mod  |    9 +
 .../src/test/resources/dist-home/modules/jaas.mod  |   16 +
 .../src/test/resources/dist-home/modules/jamon.mod |   30 +
 .../src/test/resources/dist-home/modules/jaspi.mod |   10 +
 .../test/resources/dist-home/modules/jminix.mod    |   41 +
 .../resources/dist-home/modules/jmx-remote.mod     |   18 +
 .../src/test/resources/dist-home/modules/jmx.mod   |   13 +
 .../src/test/resources/dist-home/modules/jndi.mod  |   11 +
 .../test/resources/dist-home/modules/jolokia.mod   |   19 +
 .../dist-home/modules/jsp-impl/apache-jsp.mod      |   10 +
 .../dist-home/modules/jsp-impl/apache-jstl.mod     |    8 +
 .../dist-home/modules/jsp-impl/glassfish-jsp.mod   |    8 +
 .../dist-home/modules/jsp-impl/glassfish-jstl.mod  |    6 +
 .../src/test/resources/dist-home/modules/jsp.mod   |   21 +
 .../src/test/resources/dist-home/modules/jstl.mod  |   14 +
 .../src/test/resources/dist-home/modules/jvm.mod   |   23 +
 .../test/resources/dist-home/modules/logging.mod   |   31 +
 .../resources/dist-home/modules/lowresources.mod   |   18 +
 .../test/resources/dist-home/modules/monitor.mod   |   13 +
 .../src/test/resources/dist-home/modules/plus.mod  |   15 +
 .../modules/protonego-impl/alpn-1.7.0_40.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_45.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_51.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_55.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_60.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_65.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_67.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_71.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_72.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_75.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_76.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_79.mod       |    8 +
 .../modules/protonego-impl/alpn-1.7.0_80.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0.mod          |    8 +
 .../modules/protonego-impl/alpn-1.8.0_05.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_11.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_20.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_25.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_31.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_40.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_45.mod       |    8 +
 .../modules/protonego-impl/alpn-1.8.0_51.mod       |    8 +
 .../dist-home/modules/protonego-impl/alpn.mod      |   42 +
 .../modules/protonego-impl/npn-1.7.0_04.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_05.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_06.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_07.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_09.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_10.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_11.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_13.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_15.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_17.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_21.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_25.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_40.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_45.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_51.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_55.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_60.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_65.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_67.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_71.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_72.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_75.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_76.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_79.mod        |    8 +
 .../modules/protonego-impl/npn-1.7.0_80.mod        |    8 +
 .../dist-home/modules/protonego-impl/npn.mod       |   37 +
 .../test/resources/dist-home/modules/protonego.mod |   24 +
 .../src/test/resources/dist-home/modules/proxy.mod |   22 +
 .../resources/dist-home/modules/quickstart.mod     |   12 +
 .../resources/dist-home/modules/requestlog.mod     |   30 +
 .../test/resources/dist-home/modules/resources.mod |   10 +
 .../test/resources/dist-home/modules/rewrite.mod   |   12 +
 .../test/resources/dist-home/modules/security.mod  |    9 +
 .../test/resources/dist-home/modules/server.mod    |   49 +
 .../test/resources/dist-home/modules/servlet.mod   |    9 +
 .../test/resources/dist-home/modules/servlets.mod  |   10 +
 .../test/resources/dist-home/modules/setuid.mod    |   19 +
 .../src/test/resources/dist-home/modules/spdy.mod  |   26 +
 .../test/resources/dist-home/modules/spring.mod    |   16 +
 .../src/test/resources/dist-home/modules/ssl.mod   |   40 +
 .../src/test/resources/dist-home/modules/stats.mod |    9 +
 .../test/resources/dist-home/modules/webapp.mod    |   10 +
 .../test/resources/dist-home/modules/websocket.mod |   12 +
 .../test/resources/dist-home/modules/xinetd.mod    |   17 +
 .../src/test/resources/empty.home/start.ini        |    3 +
 .../extra-jetty-dirs/logging/etc/jetty-logging.xml |    0
 .../logging/lib/logging/logback.jar                |    0
 .../resources/extra-jetty-dirs/logging/start.ini   |    1 +
 .../extra-jetty-dirs/more-startd/start.d/more.ini  |    0
 .../{jetty.home/lib => extra-libs}/example.jar     |    0
 .../example.properties                             |    0
 .../src/test/resources/hb.1/base/start.d/jmx.ini   |    0
 .../test/resources/hb.1/base/start.d/logging.ini   |    1 +
 .../src/test/resources/hb.1/base/start.d/myapp.ini |    0
 jetty-start/src/test/resources/hb.1/base/start.ini |    7 +
 .../src/test/resources/hb.1/home/start.d/jmx.ini   |    0
 .../src/test/resources/hb.1/home/start.d/jndi.ini  |    0
 .../src/test/resources/hb.1/home/start.d/jsp.ini   |    0
 .../test/resources/hb.1/home/start.d/logging.ini   |    1 +
 .../src/test/resources/hb.1/home/start.d/ssl.ini   |    0
 jetty-start/src/test/resources/hb.1/home/start.ini |   11 +
 .../lib/example of a library with spaces.jar       |    0
 .../jetty home with spaces/modules/base.mod        |    2 +
 .../resources/jetty home with spaces/start.ini     |    6 +
 .../jetty.home/etc/test-jetty-security.xml         |    1 -
 .../resources/jetty.home/etc/test-jetty-ssl.xml    |    1 -
 .../test/resources/jetty.home/etc/test-jetty.xml   |    1 -
 .../src/test/resources/jetty.home/lib/core.jar     |  Bin 1177 -> 0 bytes
 .../resources/jetty.home/lib/foo/bar/foobar.jar    |  Bin 1172 -> 0 bytes
 .../src/test/resources/jetty.home/lib/http.jar     |  Bin 1172 -> 0 bytes
 .../src/test/resources/jetty.home/lib/io.jar       |  Bin 1167 -> 0 bytes
 .../src/test/resources/jetty.home/lib/readme.txt   |    5 -
 .../src/test/resources/jetty.home/lib/server.jar   |  Bin 1175 -> 0 bytes
 .../src/test/resources/jetty.home/lib/util.jar     |  Bin 1189 -> 0 bytes
 .../src/test/resources/jetty.home/lib/xml.jar      |  Bin 1206 -> 0 bytes
 .../test/resources/jetty.home/start.d/10-jmx.ini   |   22 -
 .../resources/jetty.home/start.d/20-websocket.ini  |   13 -
 .../resources/jetty.home/start.d/90-testrealm.ini  |    1 -
 .../src/test/resources/jetty.home/start.ini        |   65 -
 jetty-start/src/test/resources/test-alt.xml        |    1 -
 .../test/resources/usecases/assert-barebones.txt   |   16 +
 .../assert-enable-spdy-bad-npn-version.txt         |   16 +
 .../test/resources/usecases/assert-enable-spdy.txt |   49 +
 .../usecases/assert-include-jetty-dir-logging.txt  |   24 +
 .../src/test/resources/usecases/assert-jmx.txt     |   18 +
 .../test/resources/usecases/assert-jsp-apache.txt  |   26 +
 .../resources/usecases/assert-jsp-glassfish.txt    |   28 +
 .../src/test/resources/usecases/assert-logging.txt |   32 +
 .../usecases/assert-missing-npn-version.txt        |   28 +
 .../test/resources/usecases/assert-props.agent.txt |   20 +
 .../test/resources/usecases/assert-props.basic.txt |   17 +
 .../src/test/resources/usecases/assert-with-db.txt |   31 +
 .../usecases/assert-with-module-persistence.txt    |   44 +
 .../test/resources/usecases/assert-with.ext.txt    |   26 +
 .../resources/usecases/base.barebones/start.ini    |    5 +
 .../base.enable.spdy.bad.npn.version/start.ini     |   12 +
 .../resources/usecases/base.enable.spdy/start.ini  |   12 +
 .../src/test/resources/usecases/base.jmx/start.ini |    4 +
 .../base.logging/lib/logging/jul-to-slf4j.jar      |    0
 .../base.logging/lib/logging/logback-classic.jar   |    0
 .../base.logging/lib/logging/logback-core.jar      |    0
 .../base.logging/lib/logging/slf4j-api.jar         |    0
 .../usecases/base.logging/modules/logging.mod      |   20 +
 .../resources/jetty-logging.properties             |    2 +
 .../usecases/base.logging/resources/logback.xml    |    0
 .../test/resources/usecases/base.logging/start.ini |    7 +
 .../usecases/base.missing.npn.version/start.ini    |   12 +
 .../base.props.agent/lib/agent-jdk-1.5.jar         |    0
 .../base.props.agent/lib/agent-jdk-1.6.jar         |    0
 .../base.props.agent/lib/agent-jdk-1.7.jar         |    0
 .../usecases/base.props.agent/modules/agent.mod    |    8 +
 .../resources/usecases/base.props.agent/start.ini  |    4 +
 .../resources/usecases/base.props.basic/start.ini  |    5 +
 .../usecases/base.with.db/etc/jetty-db.xml         |    1 +
 .../usecases/base.with.db/lib/db/bonecp.jar        |    0
 .../usecases/base.with.db/lib/db/mysql-driver.jar  |    0
 .../resources/usecases/base.with.db/modules/db.mod |   11 +
 .../test/resources/usecases/base.with.db/start.ini |    7 +
 .../usecases/base.with.ext/lib/ext/agent.jar       |    0
 .../base.with.ext/lib/ext/jdbc/mariadb-jdbc.jar    |    0
 .../base.with.ext/lib/ext/logging/jul-to-slf4j.jar |    0
 .../lib/ext/logging/logback-classic.jar            |    0
 .../base.with.ext/lib/ext/logging/logback-core.jar |    0
 .../base.with.ext/lib/ext/logging/slf4j-api.jar    |    0
 .../usecases/base.with.ext/lib/jetty-util-alt.jar  |    0
 .../resources/usecases/base.with.ext/start.ini     |    6 +
 .../base.with.include.jetty.dirs/start.ini         |    5 +
 .../usecases/base.with.jsp.apache/start.ini        |    7 +
 .../resources/usecases/base.with.jsp.bad/start.ini |    7 +
 .../usecases/base.with.jsp.default/start.ini       |    6 +
 .../usecases/base.with.jsp.glassfish/start.ini     |    7 +
 .../test/resources/usecases/home/etc/README.spnego |    0
 .../usecases/home/etc/jdbcRealm.properties         |    0
 .../usecases/home/etc/jetty-annotations.xml        |    0
 .../resources/usecases/home/etc/jetty-contexts.xml |    0
 .../resources/usecases/home/etc/jetty-debug.xml    |    0
 .../resources/usecases/home/etc/jetty-demo.xml     |    0
 .../resources/usecases/home/etc/jetty-deploy.xml   |    0
 .../resources/usecases/home/etc/jetty-http.xml     |    0
 .../resources/usecases/home/etc/jetty-https.xml    |    0
 .../resources/usecases/home/etc/jetty-ipaccess.xml |    0
 .../resources/usecases/home/etc/jetty-jaas.xml     |    0
 .../test/resources/usecases/home/etc/jetty-jmx.xml |    0
 .../resources/usecases/home/etc/jetty-logging.xml  |    0
 .../usecases/home/etc/jetty-lowresources.xml       |    0
 .../resources/usecases/home/etc/jetty-monitor.xml  |    0
 .../resources/usecases/home/etc/jetty-plus.xml     |    0
 .../resources/usecases/home/etc/jetty-proxy.xml    |    0
 .../usecases/home/etc/jetty-requestlog.xml         |    0
 .../resources/usecases/home/etc/jetty-rewrite.xml  |    0
 .../resources/usecases/home/etc/jetty-setuid.xml   |    0
 .../usecases/home/etc/jetty-spdy-proxy.xml         |    0
 .../resources/usecases/home/etc/jetty-spdy.xml     |    0
 .../test/resources/usecases/home/etc/jetty-ssl.xml |    0
 .../resources/usecases/home/etc/jetty-started.xml  |    0
 .../resources/usecases/home/etc/jetty-stats.xml    |    0
 .../usecases/home/etc/jetty-testrealm.xml          |    0
 .../resources/usecases/home/etc/jetty-webapps.xml  |    0
 .../usecases/home/etc/jetty-websockets.xml         |    0
 .../resources/usecases/home/etc/jetty-xinetd.xml   |    0
 .../test/resources/usecases/home/etc/jetty.conf    |    0
 .../src/test/resources/usecases/home/etc/jetty.xml |    0
 .../src/test/resources/usecases/home/etc/keystore  |    0
 .../src/test/resources/usecases/home/etc/krb5.ini  |    0
 .../resources/usecases/home/etc/protonego-alpn.xml |    0
 .../resources/usecases/home/etc/protonego-npn.xml  |    0
 .../resources/usecases/home/etc/realm.properties   |    0
 .../test/resources/usecases/home/etc/spnego.conf   |    0
 .../resources/usecases/home/etc/spnego.properties  |    0
 .../resources/usecases/home/etc/test-realm.xml     |    0
 .../resources/usecases/home/etc/webdefault.xml     |    0
 .../lib/annotations/javax.annotation-api-1.2.jar   |    0
 .../lib/annotations/org.objectweb.asm-TEST.jar     |    0
 ...avax.servlet.jsp.javax.servlet.jsp-api-TEST.jar |    0
 .../org.eclipse.jetty.apache-jsp-TEST.jar          |    0
 ...lipse.jetty.orbit.org.eclipse.jdt.core-TEST.jar |    0
 .../org.mortbay.jasper.apache-el-TEST.jar          |    0
 .../org.mortbay.jasper.apache-jsp-TEST.jar         |    0
 ...g.apache.taglibs.taglibs-standard-impl-TEST.jar |    0
 ...g.apache.taglibs.taglibs-standard-spec-TEST.jar |    0
 .../test/resources/usecases/home/lib/ext/.nodelete |    0
 .../usecases/home/lib/jetty-annotations-TEST.jar   |    0
 .../usecases/home/lib/jetty-client-TEST.jar        |    0
 .../usecases/home/lib/jetty-continuation-TEST.jar  |    0
 .../usecases/home/lib/jetty-deploy-TEST.jar        |    0
 .../usecases/home/lib/jetty-http-TEST.jar          |    0
 .../resources/usecases/home/lib/jetty-io-TEST.jar  |    0
 .../usecases/home/lib/jetty-jaas-TEST.jar          |    0
 .../resources/usecases/home/lib/jetty-jmx-TEST.jar |    0
 .../usecases/home/lib/jetty-jndi-TEST.jar          |    0
 .../resources/usecases/home/lib/jetty-jsp-TEST.jar |    0
 .../usecases/home/lib/jetty-plus-TEST.jar          |    0
 .../usecases/home/lib/jetty-proxy-TEST.jar         |    0
 .../usecases/home/lib/jetty-rewrite-TEST.jar       |    0
 .../usecases/home/lib/jetty-schemas-3.1.RC0.jar    |    0
 .../usecases/home/lib/jetty-schemas-3.1.jar        |    0
 .../usecases/home/lib/jetty-security-TEST.jar      |    0
 .../usecases/home/lib/jetty-server-TEST.jar        |    0
 .../usecases/home/lib/jetty-servlet-TEST.jar       |    0
 .../usecases/home/lib/jetty-servlets-TEST.jar      |    0
 .../usecases/home/lib/jetty-util-TEST.jar          |    0
 .../usecases/home/lib/jetty-webapp-TEST.jar        |    0
 .../resources/usecases/home/lib/jetty-xml-TEST.jar |    0
 .../home/lib/jndi/javax.activation-1.1.jar         |    0
 .../home/lib/jndi/javax.transaction-api-1.2.jar    |    0
 .../usecases/home/lib/jsp/javax.el-TEST.jar        |    0
 .../home/lib/jsp/javax.servlet.jsp-TEST.jar        |    0
 .../home/lib/jsp/javax.servlet.jsp-api-TEST.jar    |    0
 .../home/lib/jsp/javax.servlet.jsp.jstl-TEST.jar   |    0
 .../usecases/home/lib/jsp/jetty-jsp-jdt-TEST.jar   |    0
 .../home/lib/jsp/org.eclipse.jdt.core-TEST.jar     |    0
 ...pse.jetty.orbit.javax.servlet.jsp.jstl-TEST.jar |    0
 .../home/lib/monitor/jetty-monitor-TEST.jar        |    0
 .../usecases/home/lib/servlet-api-3.1.jar          |    0
 .../home/lib/setuid/jetty-setuid-java-1.0.1.jar    |    0
 .../usecases/home/lib/setuid/libsetuid-linux.so    |    0
 .../usecases/home/lib/setuid/libsetuid-osx.so      |    0
 .../usecases/home/lib/spdy/spdy-client-TEST.jar    |    0
 .../usecases/home/lib/spdy/spdy-core-TEST.jar      |    0
 .../home/lib/spdy/spdy-http-common-TEST.jar        |    0
 .../home/lib/spdy/spdy-http-server-TEST.jar        |    0
 .../usecases/home/lib/spdy/spdy-server-TEST.jar    |    0
 .../websocket/javax-websocket-client-impl-TEST.jar |    0
 .../websocket/javax-websocket-server-impl-TEST.jar |    0
 .../home/lib/websocket/javax.websocket-api-1.0.jar |    0
 .../home/lib/websocket/websocket-api-TEST.jar      |    0
 .../home/lib/websocket/websocket-client-TEST.jar   |    0
 .../home/lib/websocket/websocket-common-TEST.jar   |    0
 .../home/lib/websocket/websocket-server-TEST.jar   |    0
 .../home/lib/websocket/websocket-servlet-TEST.jar  |    0
 .../usecases/home/modules/annotations.mod          |   17 +
 .../test/resources/usecases/home/modules/base.mod  |   11 +
 .../resources/usecases/home/modules/client.mod     |    7 +
 .../test/resources/usecases/home/modules/debug.mod |    9 +
 .../resources/usecases/home/modules/deploy.mod     |   14 +
 .../test/resources/usecases/home/modules/ext.mod   |   10 +
 .../test/resources/usecases/home/modules/http.mod  |    9 +
 .../test/resources/usecases/home/modules/https.mod |   10 +
 .../resources/usecases/home/modules/ipaccess.mod   |    9 +
 .../test/resources/usecases/home/modules/jaas.mod  |   14 +
 .../test/resources/usecases/home/modules/jmx.mod   |   11 +
 .../test/resources/usecases/home/modules/jndi.mod  |   11 +
 .../usecases/home/modules/jsp-impl/apache-jsp.mod  |   10 +
 .../home/modules/jsp-impl/glassfish-jsp.mod        |    8 +
 .../test/resources/usecases/home/modules/jsp.mod   |   20 +
 .../resources/usecases/home/modules/logging.mod    |   31 +
 .../usecases/home/modules/lowresources.mod         |    9 +
 .../resources/usecases/home/modules/monitor.mod    |   13 +
 .../test/resources/usecases/home/modules/plus.mod  |   15 +
 .../home/modules/protonego-impl/alpn-1.7.0_40.mod  |    8 +
 .../home/modules/protonego-impl/alpn-1.7.0_45.mod  |    8 +
 .../home/modules/protonego-impl/alpn-1.7.0_51.mod  |    8 +
 .../home/modules/protonego-impl/alpn-1.7.0_55.mod  |    8 +
 .../home/modules/protonego-impl/alpn-1.7.0_60.mod  |    8 +
 .../home/modules/protonego-impl/alpn-1.8.0.mod     |    8 +
 .../home/modules/protonego-impl/alpn-1.8.0_05.mod  |    8 +
 .../usecases/home/modules/protonego-impl/alpn.mod  |   36 +
 .../home/modules/protonego-impl/npn-1.7.0_04.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_05.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_06.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_07.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_09.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_10.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_11.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_13.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_15.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_17.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_21.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_25.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_40.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_45.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_51.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_55.mod   |    8 +
 .../home/modules/protonego-impl/npn-1.7.0_60.mod   |    8 +
 .../usecases/home/modules/protonego-impl/npn.mod   |   31 +
 .../resources/usecases/home/modules/protonego.mod  |   15 +
 .../test/resources/usecases/home/modules/proxy.mod |   14 +
 .../resources/usecases/home/modules/requestlog.mod |    9 +
 .../resources/usecases/home/modules/resources.mod  |   10 +
 .../resources/usecases/home/modules/rewrite.mod    |   13 +
 .../resources/usecases/home/modules/security.mod   |    9 +
 .../resources/usecases/home/modules/server.mod     |   21 +
 .../resources/usecases/home/modules/servlet.mod    |    9 +
 .../test/resources/usecases/home/modules/spdy.mod  |   26 +
 .../test/resources/usecases/home/modules/ssl.mod   |   35 +
 .../test/resources/usecases/home/modules/stats.mod |    9 +
 .../resources/usecases/home/modules/webapp.mod     |    9 +
 .../resources/usecases/home/modules/websocket.mod  |   17 +
 .../resources/usecases/home/modules/xinetd.mod     |    9 +
 .../test/resources/usecases/home/modules/xml.mod   |   10 +
 .../resources/usecases/home/resources/.nodelete    |    0
 .../src/test/resources/usecases/home/start.ini     |    2 +
 jetty-util-ajax/pom.xml                            |   91 +
 .../java/org/eclipse/jetty/util/ajax/JSON.java     | 1640 ++++++
 .../jetty/util/ajax/JSONCollectionConvertor.java   |    0
 .../eclipse/jetty/util/ajax/JSONDateConvertor.java |  105 +
 .../eclipse/jetty/util/ajax/JSONEnumConvertor.java |    0
 .../jetty/util/ajax/JSONObjectConvertor.java       |    0
 .../eclipse/jetty/util/ajax/JSONPojoConvertor.java |    0
 .../jetty/util/ajax/JSONPojoConvertorFactory.java  |    0
 .../org/eclipse/jetty/util/ajax/package-info.java  |   23 +
 .../util/ajax/JSONCollectionConvertorTest.java     |    0
 .../util/ajax/JSONPojoConvertorFactoryTest.java    |  417 ++
 .../jetty/util/ajax/JSONPojoConvertorTest.java     |  441 ++
 .../java/org/eclipse/jetty/util/ajax/JSONTest.java |  469 ++
 jetty-util/pom.xml                                 |   13 +-
 jetty-util/src/main/config/etc/jetty-logging.xml   |   12 +-
 jetty-util/src/main/config/modules/logging.mod     |   31 +
 .../java/org/eclipse/jetty/util/AbstractTrie.java  |   85 +
 .../java/org/eclipse/jetty/util/ArrayQueue.java    |   33 +-
 .../org/eclipse/jetty/util/ArrayTernaryTrie.java   |  511 ++
 .../java/org/eclipse/jetty/util/ArrayTrie.java     |  477 ++
 .../java/org/eclipse/jetty/util/ArrayUtil.java     |  142 +
 .../main/java/org/eclipse/jetty/util/Atomics.java  |   20 +-
 .../java/org/eclipse/jetty/util/AttributesMap.java |  138 +-
 .../main/java/org/eclipse/jetty/util/B64Code.java  |  117 +-
 .../org/eclipse/jetty/util/BlockingArrayQueue.java |  872 +--
 .../org/eclipse/jetty/util/BlockingCallback.java   |  105 +
 .../java/org/eclipse/jetty/util/BufferUtil.java    | 1088 ++++
 .../eclipse/jetty/util/ByteArrayISO8859Writer.java |   13 +-
 .../eclipse/jetty/util/ByteArrayOutputStream2.java |    5 +
 .../main/java/org/eclipse/jetty/util/Callback.java |   79 +
 .../jetty/util/ClassLoadingObjectInputStream.java  |  105 +
 .../eclipse/jetty/util/CompletableCallback.java    |  168 +
 .../eclipse/jetty/util/ConcurrentArrayQueue.java   |  573 ++
 .../org/eclipse/jetty/util/CountingCallback.java   |   98 +
 .../java/org/eclipse/jetty/util/DateCache.java     |  275 +-
 .../main/java/org/eclipse/jetty/util/Fields.java   |  336 ++
 .../org/eclipse/jetty/util/FutureCallback.java     |  157 +
 .../java/org/eclipse/jetty/util/FuturePromise.java |  159 +
 .../org/eclipse/jetty/util/HttpCookieStore.java    |  114 +
 .../src/main/java/org/eclipse/jetty/util/IO.java   |  146 +-
 .../org/eclipse/jetty/util/IteratingCallback.java  |  543 ++
 .../jetty/util/IteratingNestedCallback.java        |   67 +
 .../main/java/org/eclipse/jetty/util/Jetty.java    |   39 +
 .../main/java/org/eclipse/jetty/util/LazyList.java |   98 +-
 .../java/org/eclipse/jetty/util/LeakDetector.java  |  208 +
 .../main/java/org/eclipse/jetty/util/Loader.java   |   70 +-
 .../java/org/eclipse/jetty/util/MemoryUtils.java   |   71 +
 .../org/eclipse/jetty/util/MultiException.java     |  103 +-
 .../main/java/org/eclipse/jetty/util/MultiMap.java |  440 +-
 .../eclipse/jetty/util/MultiPartInputStream.java   |  851 ---
 .../jetty/util/MultiPartInputStreamParser.java     |  827 +++
 .../eclipse/jetty/util/MultiPartOutputStream.java  |   50 +-
 .../org/eclipse/jetty/util/MultiPartWriter.java    |   24 +-
 .../main/java/org/eclipse/jetty/util/Promise.java  |   65 +
 .../eclipse/jetty/util/QuotedStringTokenizer.java  |   88 +-
 .../eclipse/jetty/util/ReadLineInputStream.java    |    7 +-
 .../main/java/org/eclipse/jetty/util/Scanner.java  |   50 +-
 .../eclipse/jetty/util/SharedBlockingCallback.java |  302 ++
 .../eclipse/jetty/util/SocketAddressResolver.java  |  176 +
 .../java/org/eclipse/jetty/util/StringMap.java     |  695 ---
 .../java/org/eclipse/jetty/util/StringUtil.java    |  355 +-
 .../main/java/org/eclipse/jetty/util/TreeTrie.java |  358 ++
 .../src/main/java/org/eclipse/jetty/util/Trie.java |  124 +
 .../main/java/org/eclipse/jetty/util/TypeUtil.java |  260 +-
 .../main/java/org/eclipse/jetty/util/URIUtil.java  |  186 +-
 .../main/java/org/eclipse/jetty/util/Uptime.java   |  132 +
 .../java/org/eclipse/jetty/util/UrlEncoded.java    |  554 +-
 .../org/eclipse/jetty/util/Utf8Appendable.java     |   18 +
 .../org/eclipse/jetty/util/Utf8LineParser.java     |   99 +
 .../java/org/eclipse/jetty/util/ajax/JSON.java     | 1640 ------
 .../eclipse/jetty/util/ajax/JSONDateConvertor.java |  107 -
 .../jetty/util/annotation/ManagedAttribute.java    |   82 +
 .../jetty/util/annotation/ManagedObject.java       |   45 +
 .../jetty/util/annotation/ManagedOperation.java    |   60 +
 .../org/eclipse/jetty/util/annotation/Name.java    |   49 +
 .../jetty/util/annotation/package-info.java        |   23 +
 .../jetty/util/component/AbstractLifeCycle.java    |   79 +-
 .../jetty/util/component/AggregateLifeCycle.java   |  441 --
 .../eclipse/jetty/util/component/Container.java    |  315 +-
 .../jetty/util/component/ContainerLifeCycle.java   |  813 +++
 .../org/eclipse/jetty/util/component/Dumpable.java |    6 +
 .../jetty/util/component/FileDestroyable.java      |   14 +-
 .../component/FileNoticeLifeCycleListener.java     |    7 +-
 .../org/eclipse/jetty/util/component/Graceful.java |   29 +
 .../eclipse/jetty/util/component/LifeCycle.java    |    6 +
 .../eclipse/jetty/util/component/package-info.java |   23 +
 .../org/eclipse/jetty/util/log/AbstractLogger.java |    9 +
 .../org/eclipse/jetty/util/log/JavaUtilLog.java    |   15 +-
 .../main/java/org/eclipse/jetty/util/log/Log.java  |  293 +-
 .../java/org/eclipse/jetty/util/log/Logger.java    |    9 +
 .../java/org/eclipse/jetty/util/log/LoggerLog.java |   16 +
 .../java/org/eclipse/jetty/util/log/Slf4jLog.java  |    6 +
 .../eclipse/jetty/util/log/StacklessLogging.java   |   69 +
 .../java/org/eclipse/jetty/util/log/StdErrLog.java |  240 +-
 .../org/eclipse/jetty/util/log/package-info.java   |   23 +
 .../java/org/eclipse/jetty/util/package-info.java  |   23 +
 .../jetty/util/preventers/AWTLeakPreventer.java    |    3 +-
 .../util/preventers/AppContextLeakPreventer.java   |    3 +-
 .../preventers/DriverManagerLeakPreventer.java     |    3 +-
 .../util/preventers/GCThreadLeakPreventer.java     |    2 +-
 .../jetty/util/preventers/package-info.java        |   23 +
 .../eclipse/jetty/util/resource/BadResource.java   |    9 -
 .../eclipse/jetty/util/resource/EmptyResource.java |  130 +
 .../eclipse/jetty/util/resource/FileResource.java  |  283 +-
 .../jetty/util/resource/JarFileResource.java       |   61 +-
 .../eclipse/jetty/util/resource/JarResource.java   |  193 +-
 .../eclipse/jetty/util/resource/PathResource.java  |  354 ++
 .../org/eclipse/jetty/util/resource/Resource.java  |  137 +-
 .../jetty/util/resource/ResourceCollection.java    |   49 +-
 .../eclipse/jetty/util/resource/URLResource.java   |   55 +-
 .../eclipse/jetty/util/resource/package-info.java  |   23 +
 .../org/eclipse/jetty/util/security/B64Code.java   |   33 -
 .../eclipse/jetty/util/security/Constraint.java    |   30 +-
 .../eclipse/jetty/util/security/Credential.java    |   16 +-
 .../org/eclipse/jetty/util/security/Password.java  |   74 +-
 .../eclipse/jetty/util/security/package-info.java  |   23 +
 .../util/ssl/AliasedX509ExtendedKeyManager.java    |    2 +-
 .../jetty/util/ssl/AliasedX509KeyManager.java      |    2 +-
 .../eclipse/jetty/util/ssl/SslContextFactory.java  |  584 +--
 .../org/eclipse/jetty/util/ssl/package-info.java   |   23 +
 .../jetty/util/statistic/CounterStatistic.java     |   31 +-
 .../jetty/util/statistic/SampleStatistic.java      |    7 +
 .../eclipse/jetty/util/statistic/package-info.java |   23 +
 .../jetty/util/thread/ExecutorThreadPool.java      |    8 +
 .../jetty/util/thread/NonBlockingThread.java       |   59 +
 .../jetty/util/thread/QueuedThreadPool.java        |  593 ++-
 .../util/thread/ScheduledExecutorScheduler.java    |  141 +
 .../org/eclipse/jetty/util/thread/Scheduler.java   |   33 +
 .../eclipse/jetty/util/thread/ShutdownThread.java  |    8 +-
 .../org/eclipse/jetty/util/thread/Sweeper.java     |  194 +
 .../org/eclipse/jetty/util/thread/ThreadPool.java  |   16 +-
 .../org/eclipse/jetty/util/thread/Timeout.java     |  380 --
 .../eclipse/jetty/util/thread/TimerScheduler.java  |  129 +
 .../eclipse/jetty/util/thread/package-info.java    |   23 +
 .../org/eclipse/jetty/util/ArrayQueueTest.java     |   26 +-
 .../java/org/eclipse/jetty/util/B64CodeTest.java   |   14 +-
 .../eclipse/jetty/util/BlockingArrayQueueTest.java |  342 +-
 .../eclipse/jetty/util/BlockingCallbackTest.java   |  123 +
 .../org/eclipse/jetty/util/BufferUtilTest.java     |  338 ++
 .../org/eclipse/jetty/util/CollectionAssert.java   |  137 +
 .../jetty/util/ConcurrentArrayQueueTest.java       |  172 +
 .../java/org/eclipse/jetty/util/DateCacheTest.java |   92 +-
 .../org/eclipse/jetty/util/FutureCallbackTest.java |  212 +
 .../org/eclipse/jetty/util/IPAddressMapTest.java   |   62 +-
 .../eclipse/jetty/util/IteratingCallbackTest.java  |  300 ++
 .../java/org/eclipse/jetty/util/LazyListTest.java  |  384 +-
 .../org/eclipse/jetty/util/LeakDetectorTest.java   |   92 +
 .../org/eclipse/jetty/util/MultiExceptionTest.java |   37 +-
 .../java/org/eclipse/jetty/util/MultiMapTest.java  |  225 +-
 .../jetty/util/MultiPartInputStreamTest.java       |  285 +-
 .../org/eclipse/jetty/util/QueueBenchmarkTest.java |  222 +
 .../jetty/util/QuotedStringTokenizerTest.java      |   52 +-
 .../jetty/util/ReadLineInputStreamTest.java        |  247 +
 .../java/org/eclipse/jetty/util/ScannerTest.java   |   97 +-
 .../jetty/util/SharedBlockingCallbackTest.java     |  259 +
 .../java/org/eclipse/jetty/util/StringMapTest.java |  320 --
 .../org/eclipse/jetty/util/StringUtilTest.java     |   79 +-
 .../eclipse/jetty/util/TestIntrospectionUtil.java  |   52 +-
 .../test/java/org/eclipse/jetty/util/TrieTest.java |  245 +
 .../java/org/eclipse/jetty/util/TypeUtilTest.java  |   31 +-
 .../test/java/org/eclipse/jetty/util/URITest.java  |  244 -
 .../java/org/eclipse/jetty/util/URIUtilTest.java   |  274 +
 .../org/eclipse/jetty/util/URLEncodedTest.java     |  159 +-
 .../java/org/eclipse/jetty/util/UptimeTest.java    |   31 +
 .../org/eclipse/jetty/util/UrlEncodedUtf8Test.java |  165 +
 .../org/eclipse/jetty/util/Utf8LineParserTest.java |  191 +
 .../eclipse/jetty/util/Utf8StringBufferTest.java   |   11 +-
 .../util/Utf8StringBuilderInvalidUtfTest.java      |   71 +
 .../eclipse/jetty/util/Utf8StringBuilderTest.java  |   76 +-
 .../util/ajax/JSONPojoConvertorFactoryTest.java    |  418 --
 .../jetty/util/ajax/JSONPojoConvertorTest.java     |  441 --
 .../java/org/eclipse/jetty/util/ajax/JSONTest.java |  473 --
 .../util/component/AggregateLifeCycleTest.java     |  288 -
 .../util/component/ContainerLifeCycleTest.java     |  581 ++
 .../component/LifeCycleListenerNestedTest.java     |  280 +
 .../util/component/LifeCycleListenerTest.java      |   28 +-
 .../eclipse/jetty/util/log/JavaUtilLogTest.java    |   60 +-
 .../java/org/eclipse/jetty/util/log/LogTest.java   |    5 +-
 .../org/eclipse/jetty/util/log/StdErrCapture.java  |    2 +-
 .../org/eclipse/jetty/util/log/StdErrLogTest.java  |  224 +-
 .../util/resource/AbstractFSResourceTest.java      |  535 ++
 .../jetty/util/resource/FileResourceTest.java      |   61 +-
 .../jetty/util/resource/PathResourceTest.java      |   38 +
 .../jetty/util/resource/ResourceAliasTest.java     |  109 +
 .../util/resource/ResourceCollectionTest.java      |   41 +-
 .../eclipse/jetty/util/resource/ResourceTest.java  |  188 +-
 .../eclipse/jetty/util/security/PasswordTest.java  |   52 +
 .../jetty/util/ssl/SslContextFactoryTest.java      |   90 +-
 .../jetty/util/statistic/SampleStatisticTest.java  |   24 +-
 .../jetty/util/thread/QueuedThreadPoolTest.java    |  159 +-
 .../eclipse/jetty/util/thread/SchedulerTest.java   |  334 ++
 .../org/eclipse/jetty/util/thread/SweeperTest.java |  124 +
 .../org/eclipse/jetty/util/thread/TimeoutTest.java |  270 -
 .../src/test/resources/TestData/WindowsDir.zip     |  Bin 0 -> 2388 bytes
 .../resources/TestData/test/META-INF/MANIFEST.MF   |    0
 .../src/test/resources/TestData/test/alphabet      |    0
 .../src/test/resources/TestData/test/numbers       |    0
 .../test/resources/TestData/test/subdir/alphabet   |    0
 .../test/resources/TestData/test/subdir/numbers    |    0
 .../TestData/test/subdir/subsubdir/alphabet        |    0
 .../TestData/test/subdir/subsubdir/numbers         |    0
 .../src/test/resources/jetty-logging.properties    |    3 +-
 .../org/eclipse/jetty/util/resource/four/four      |    1 +
 .../org/eclipse/jetty/util/resource/four/four.txt  |    1 +
 .../org/eclipse/jetty/util/resource/resource.txt   |    1 +
 jetty-webapp/pom.xml                               |    8 +-
 jetty-webapp/src/main/config/etc/webdefault.xml    |  155 +-
 jetty-webapp/src/main/config/modules/webapp.mod    |   10 +
 .../org/eclipse/jetty/webapp/ClasspathPattern.java |   46 +-
 .../org/eclipse/jetty/webapp/Configuration.java    |  112 +-
 .../java/org/eclipse/jetty/webapp/Descriptor.java  |   13 +-
 .../jetty/webapp/FragmentConfiguration.java        |   25 +-
 .../jetty/webapp/JettyWebXmlConfiguration.java     |   50 +-
 .../java/org/eclipse/jetty/webapp/MetaData.java    |  410 +-
 .../eclipse/jetty/webapp/MetaInfConfiguration.java |  340 +-
 .../jetty/webapp/StandardDescriptorProcessor.java  |  807 +--
 .../eclipse/jetty/webapp/TagLibConfiguration.java  |  530 --
 .../eclipse/jetty/webapp/WebAppClassLoader.java    |  131 +-
 .../org/eclipse/jetty/webapp/WebAppContext.java    |  437 +-
 .../org/eclipse/jetty/webapp/WebDescriptor.java    |  265 +-
 .../eclipse/jetty/webapp/WebInfConfiguration.java  |  532 +-
 .../eclipse/jetty/webapp/WebXmlConfiguration.java  |    7 +-
 .../org/eclipse/jetty/webapp/package-info.java     |   23 +
 .../webapp/jmx/WebAppContext-mbean.properties      |   14 -
 .../org/eclipse/jetty/webapp/OrderingTest.java     |  263 +-
 .../jetty/webapp/WebAppClassLoaderTest.java        |   90 +-
 .../eclipse/jetty/webapp/WebAppContextTest.java    |   60 +-
 jetty-websocket/{README.txt => README.TXT}         |    0
 .../javax-websocket-client-impl/pom.xml            |  100 +
 .../jetty/websocket/jsr356/AbstractJsrRemote.java  |  195 +
 .../websocket/jsr356/BasicEndpointConfig.java      |   63 +
 .../jetty/websocket/jsr356/ClientContainer.java    |  390 ++
 .../jetty/websocket/jsr356/Configurable.java       |   29 +
 .../websocket/jsr356/ConfigurationException.java   |   36 +
 .../jetty/websocket/jsr356/DecoderFactory.java     |  183 +
 .../jetty/websocket/jsr356/EncoderFactory.java     |  177 +
 .../jetty/websocket/jsr356/InitException.java      |   42 +
 .../jsr356/JettyClientContainerProvider.java       |   43 +
 .../jetty/websocket/jsr356/JsrAsyncRemote.java     |  197 +
 .../jetty/websocket/jsr356/JsrBasicRemote.java     |  121 +
 .../jetty/websocket/jsr356/JsrExtension.java       |  112 +
 .../jetty/websocket/jsr356/JsrExtensionConfig.java |   35 +
 .../websocket/jsr356/JsrHandshakeResponse.java     |   42 +
 .../jetty/websocket/jsr356/JsrPongMessage.java     |   39 +
 .../eclipse/jetty/websocket/jsr356/JsrSession.java |  383 ++
 .../jetty/websocket/jsr356/JsrSessionFactory.java  |   59 +
 .../jetty/websocket/jsr356/JsrUpgradeListener.java |   79 +
 .../websocket/jsr356/MessageHandlerFactory.java    |  100 +
 .../websocket/jsr356/MessageHandlerWrapper.java    |   82 +
 .../jetty/websocket/jsr356/MessageType.java        |   31 +
 .../annotations/AnnotatedEndpointMetadata.java     |  134 +
 .../annotations/AnnotatedEndpointScanner.java      |  213 +
 .../websocket/jsr356/annotations/IJsrMethod.java   |   83 +
 .../websocket/jsr356/annotations/IJsrParamId.java  |   43 +
 .../websocket/jsr356/annotations/JsrCallable.java  |  175 +
 .../websocket/jsr356/annotations/JsrEvents.java    |  302 ++
 .../jsr356/annotations/JsrParamIdBase.java         |   51 +
 .../jsr356/annotations/JsrParamIdBinary.java       |   71 +
 .../jsr356/annotations/JsrParamIdDecoder.java      |   75 +
 .../jsr356/annotations/JsrParamIdOnClose.java      |   49 +
 .../jsr356/annotations/JsrParamIdOnError.java      |   47 +
 .../jsr356/annotations/JsrParamIdOnMessage.java    |   40 +
 .../jsr356/annotations/JsrParamIdOnOpen.java       |   49 +
 .../jsr356/annotations/JsrParamIdPong.java         |   49 +
 .../jsr356/annotations/JsrParamIdText.java         |  158 +
 .../jsr356/annotations/OnCloseCallable.java        |   89 +
 .../jsr356/annotations/OnErrorCallable.java        |   74 +
 .../annotations/OnMessageBinaryCallable.java       |   73 +
 .../annotations/OnMessageBinaryStreamCallable.java |   73 +
 .../jsr356/annotations/OnMessageCallable.java      |  175 +
 .../jsr356/annotations/OnMessagePongCallable.java  |   59 +
 .../jsr356/annotations/OnMessageTextCallable.java  |   72 +
 .../annotations/OnMessageTextStreamCallable.java   |   72 +
 .../jsr356/annotations/OnOpenCallable.java         |   69 +
 .../jetty/websocket/jsr356/annotations/Param.java  |  135 +
 .../client/AnnotatedClientEndpointConfig.java      |  112 +
 .../client/AnnotatedClientEndpointMetadata.java    |   62 +
 .../jsr356/client/EmptyClientEndpointConfig.java   |   85 +
 .../websocket/jsr356/client/EmptyConfigurator.java |   42 +
 .../jsr356/client/JsrClientEndpointImpl.java       |  102 +
 .../jsr356/client/SimpleEndpointMetadata.java      |   72 +
 .../websocket/jsr356/decoders/AbstractDecoder.java |   35 +
 .../websocket/jsr356/decoders/BooleanDecoder.java  |   49 +
 .../jsr356/decoders/ByteArrayDecoder.java          |   43 +
 .../jsr356/decoders/ByteBufferDecoder.java         |   41 +
 .../websocket/jsr356/decoders/ByteDecoder.java     |   62 +
 .../jsr356/decoders/CharacterDecoder.java          |   52 +
 .../websocket/jsr356/decoders/DoubleDecoder.java   |   62 +
 .../websocket/jsr356/decoders/FloatDecoder.java    |   66 +
 .../jsr356/decoders/InputStreamDecoder.java        |   45 +
 .../websocket/jsr356/decoders/IntegerDecoder.java  |   63 +
 .../websocket/jsr356/decoders/LongDecoder.java     |   61 +
 .../jsr356/decoders/PongMessageDecoder.java        |   61 +
 .../decoders/PrimitiveDecoderMetadataSet.java      |   76 +
 .../websocket/jsr356/decoders/ReaderDecoder.java   |   45 +
 .../websocket/jsr356/decoders/ShortDecoder.java    |   62 +
 .../websocket/jsr356/decoders/StringDecoder.java   |   43 +
 .../websocket/jsr356/encoders/AbstractEncoder.java |   35 +
 .../websocket/jsr356/encoders/BooleanEncoder.java  |   38 +
 .../jsr356/encoders/ByteArrayEncoder.java          |   46 +
 .../jsr356/encoders/ByteBufferEncoder.java         |   46 +
 .../websocket/jsr356/encoders/ByteEncoder.java     |   38 +
 .../jsr356/encoders/CharacterEncoder.java          |   38 +
 .../jsr356/encoders/DefaultBinaryEncoder.java      |   33 +
 .../encoders/DefaultBinaryStreamEncoder.java       |   37 +
 .../jsr356/encoders/DefaultTextEncoder.java        |   31 +
 .../jsr356/encoders/DefaultTextStreamEncoder.java  |   35 +
 .../websocket/jsr356/encoders/DoubleEncoder.java   |   38 +
 .../jsr356/encoders/EncodeFailedFuture.java        |   71 +
 .../websocket/jsr356/encoders/FloatEncoder.java    |   37 +
 .../websocket/jsr356/encoders/IntegerEncoder.java  |   38 +
 .../websocket/jsr356/encoders/LongEncoder.java     |   38 +
 .../encoders/PrimitiveEncoderMetadataSet.java      |   62 +
 .../websocket/jsr356/encoders/ShortEncoder.java    |   38 +
 .../websocket/jsr356/encoders/StringEncoder.java   |   34 +
 .../jsr356/endpoints/AbstractJsrEventDriver.java   |  114 +
 .../jsr356/endpoints/EndpointInstance.java         |   58 +
 .../jsr356/endpoints/JsrAnnotatedEventDriver.java  |  396 ++
 .../jsr356/endpoints/JsrEndpointEventDriver.java   |  283 +
 .../jsr356/endpoints/JsrEndpointImpl.java          |   57 +
 .../jsr356/endpoints/JsrEventDriverFactory.java    |   52 +
 .../jsr356/messages/BinaryPartialMessage.java      |   80 +
 .../jsr356/messages/BinaryPartialOnMessage.java    |   64 +
 .../jsr356/messages/BinaryWholeMessage.java        |   67 +
 .../jsr356/messages/SendHandlerWriteCallback.java  |   46 +
 .../jsr356/messages/TextPartialMessage.java        |   59 +
 .../jsr356/messages/TextPartialOnMessage.java      |   65 +
 .../jsr356/messages/TextWholeMessage.java          |   63 +
 .../websocket/jsr356/metadata/CoderMetadata.java   |   67 +
 .../jsr356/metadata/CoderMetadataSet.java          |  255 +
 .../websocket/jsr356/metadata/DecoderMetadata.java |   34 +
 .../jsr356/metadata/DecoderMetadataSet.java        |   92 +
 .../jsr356/metadata/DuplicateCoderException.java   |   39 +
 .../websocket/jsr356/metadata/EncoderMetadata.java |   34 +
 .../jsr356/metadata/EncoderMetadataSet.java        |   92 +
 .../jsr356/metadata/EndpointMetadata.java          |   28 +
 .../jsr356/metadata/MessageHandlerMetadata.java    |   71 +
 .../jetty/websocket/jsr356/utils/Primitives.java   |   77 +
 .../services/javax.websocket.ContainerProvider     |    1 +
 .../websocket/jsr356/AnnotatedEchoClient.java      |   60 +
 .../jetty/websocket/jsr356/AnnotatedEchoTest.java  |   89 +
 .../websocket/jsr356/AnnotatedEndpointClient.java  |   60 +
 .../jsr356/AnnotatedEndpointConfigTest.java        |  189 +
 .../jsr356/AnnotatedEndpointConfigurator.java      |   34 +
 .../jetty/websocket/jsr356/ConfiguratorTest.java   |  133 +
 .../jetty/websocket/jsr356/CookiesTest.java        |  179 +
 .../jetty/websocket/jsr356/DecoderFactoryTest.java |  107 +
 .../jsr356/DecoderReaderManySmallTest.java         |  219 +
 .../jetty/websocket/jsr356/DecoderReaderTest.java  |  292 ++
 .../jetty/websocket/jsr356/EchoCaptureHandler.java |   32 +
 .../jetty/websocket/jsr356/EchoHandler.java        |   42 +
 .../jetty/websocket/jsr356/EncoderFactoryTest.java |   86 +
 .../jetty/websocket/jsr356/EncoderTest.java        |  316 ++
 .../jetty/websocket/jsr356/EndpointEchoClient.java |   66 +
 .../jetty/websocket/jsr356/EndpointEchoTest.java   |  147 +
 .../jetty/websocket/jsr356/JettyEchoSocket.java    |   75 +
 .../jetty/websocket/jsr356/JsrSessionTest.java     |  115 +
 .../jsr356/MessageHandlerFactoryTest.java          |   76 +
 .../jetty/websocket/jsr356/MessageQueue.java       |   59 +
 .../jsr356/annotations/DateTextSocket.java         |   57 +
 .../jsr356/annotations/JsrParamIdDecoderTest.java  |   57 +
 .../websocket/jsr356/decoders/BadDualDecoder.java  |  122 +
 .../websocket/jsr356/decoders/DateDecoder.java     |   62 +
 .../websocket/jsr356/decoders/DateTimeDecoder.java |   62 +
 .../jsr356/decoders/IntegerDecoderTest.java        |   37 +
 .../decoders/PrimitiveDecoderMetadataSetTest.java  |   54 +
 .../websocket/jsr356/decoders/TimeDecoder.java     |   62 +
 .../jsr356/decoders/ValidDualDecoder.java          |   65 +
 .../jetty/websocket/jsr356/demo/ExampleClient.java |   99 +
 .../jetty/websocket/jsr356/demo/ExampleSocket.java |   71 +
 .../websocket/jsr356/encoders/BadDualEncoder.java  |   54 +
 .../websocket/jsr356/encoders/DateEncoder.java     |   48 +
 .../websocket/jsr356/encoders/DateTimeEncoder.java |   48 +
 .../websocket/jsr356/encoders/DualEncoder.java     |   58 +
 .../websocket/jsr356/encoders/TimeEncoder.java     |   48 +
 .../jsr356/encoders/ValidDualEncoder.java          |   64 +
 ...nnotatedEndpointScanner_GoodSignaturesTest.java |  169 +
 ...tatedEndpointScanner_InvalidSignaturesTest.java |  113 +
 .../websocket/jsr356/endpoints/OnCloseTest.java    |  126 +
 .../websocket/jsr356/endpoints/TrackingSocket.java |  127 +
 .../BasicBinaryMessageByteBufferSocket.java        |   37 +
 .../endpoints/samples/BasicErrorSessionSocket.java |   35 +
 .../samples/BasicErrorSessionThrowableSocket.java  |   36 +
 .../jsr356/endpoints/samples/BasicErrorSocket.java |   34 +
 .../samples/BasicErrorThrowableSessionSocket.java  |   36 +
 .../samples/BasicErrorThrowableSocket.java         |   35 +
 .../endpoints/samples/BasicInputStreamSocket.java  |   47 +
 .../BasicInputStreamWithThrowableSocket.java       |   39 +
 .../samples/BasicOpenCloseSessionSocket.java       |   46 +
 .../endpoints/samples/BasicOpenCloseSocket.java    |   41 +
 .../endpoints/samples/BasicOpenSessionSocket.java  |   35 +
 .../jsr356/endpoints/samples/BasicOpenSocket.java  |   34 +
 .../endpoints/samples/BasicPongMessageSocket.java  |   36 +
 .../samples/BasicTextMessageStringSocket.java      |   35 +
 .../endpoints/samples/InvalidCloseIntSocket.java   |   37 +
 .../endpoints/samples/InvalidErrorErrorSocket.java |   37 +
 .../samples/InvalidErrorExceptionSocket.java       |   37 +
 .../endpoints/samples/InvalidErrorIntSocket.java   |   37 +
 .../samples/InvalidOpenCloseReasonSocket.java      |   38 +
 .../endpoints/samples/InvalidOpenIntSocket.java    |   37 +
 .../samples/InvalidOpenSessionIntSocket.java       |   38 +
 .../samples/close/CloseEndpointConfigSocket.java   |   36 +
 .../samples/close/CloseReasonSessionSocket.java    |   37 +
 .../endpoints/samples/close/CloseReasonSocket.java |   36 +
 .../samples/close/CloseSessionReasonSocket.java    |   37 +
 .../samples/close/CloseSessionSocket.java          |   36 +
 .../endpoints/samples/close/CloseSocket.java       |   35 +
 .../jsr356/handlers/BaseMessageHandler.java        |   30 +
 .../jsr356/handlers/ByteArrayPartialHandler.java   |   30 +
 .../jsr356/handlers/ByteArrayWholeHandler.java     |   30 +
 .../jsr356/handlers/ByteBufferPartialHandler.java  |   32 +
 .../jsr356/handlers/ByteBufferWholeHandler.java    |   32 +
 .../jsr356/handlers/ComboMessageHandler.java       |   41 +
 .../jsr356/handlers/ExtendedMessageHandler.java    |   32 +
 .../jsr356/handlers/InputStreamWholeHandler.java   |   32 +
 .../jsr356/handlers/LongMessageHandler.java        |   29 +
 .../jsr356/handlers/ReaderWholeHandler.java        |   32 +
 .../jsr356/handlers/StringPartialHandler.java      |   30 +
 .../jsr356/handlers/StringWholeHandler.java        |   30 +
 .../jsr356/metadata/DecoderMetadataSetTest.java    |  134 +
 .../jsr356/metadata/EncoderMetadataSetTest.java    |  134 +
 .../jsr356/misbehaving/AnnotatedRuntimeOnOpen.java |   65 +
 .../jsr356/misbehaving/EndpointRuntimeOnOpen.java  |   63 +
 .../jsr356/misbehaving/MisbehavingClassTest.java   |  127 +
 .../jsr356/samples/AbstractStringEndpoint.java     |   60 +
 .../websocket/jsr356/samples/DummyConnection.java  |  156 +
 .../websocket/jsr356/samples/DummyEndpoint.java    |   32 +
 .../jsr356/samples/EchoStringEndpoint.java         |   36 +
 .../jetty/websocket/jsr356/samples/ExtDecoder.java |   29 +
 .../jetty/websocket/jsr356/samples/Fruit.java      |   25 +
 .../jsr356/samples/FruitBinaryEncoder.java         |   68 +
 .../websocket/jsr356/samples/FruitDecoder.java     |   82 +
 .../websocket/jsr356/samples/FruitTextEncoder.java |   42 +
 .../jetty/websocket/jsr356/samples/IntSocket.java  |   46 +
 .../websocket/jsr356/utils/ReflectUtilsTest.java   |  138 +
 .../jetty/websocket/jsr356/utils/TypeTree.java     |  120 +
 .../src/test/resources/jetty-logging.properties    |    5 +
 .../src/test/resources/quotes-ben.txt              |    4 +
 .../src/test/resources/quotes-twain.txt            |    5 +
 .../javax-websocket-server-impl/pom.xml            |   92 +
 .../src/main/config/modules/websocket.mod          |   12 +
 .../server/AnnotatedServerEndpointConfig.java      |  209 +
 .../server/AnnotatedServerEndpointMetadata.java    |  108 +
 .../jsr356/server/BasicServerEndpointConfig.java   |  125 +
 .../server/BasicServerEndpointConfigurator.java    |  108 +
 .../jetty/websocket/jsr356/server/JsrCreator.java  |  162 +
 .../jsr356/server/JsrHandshakeRequest.java         |   86 +
 .../jsr356/server/JsrHandshakeResponse.java        |   42 +
 .../websocket/jsr356/server/JsrPathParamId.java    |   49 +
 .../jsr356/server/JsrServerEndpointImpl.java       |  110 +
 .../server/JsrServerExtendsEndpointImpl.java       |   71 +
 .../server/PathParamServerEndpointConfig.java      |   51 +
 .../websocket/jsr356/server/ServerContainer.java   |  190 +
 .../jsr356/server/ServerEndpointMetadata.java      |   30 +
 .../server/SimpleServerEndpointMetadata.java       |   61 +
 .../WebSocketServerContainerInitializer.java       |  290 +
 .../jsr356/server/pathmap/WebSocketPathSpec.java   |  344 ++
 .../javax.servlet.ServletContainerInitializer      |    1 +
 ...socket.server.ServerEndpointConfig$Configurator |    1 +
 .../java/examples/GetHttpSessionConfigurator.java  |   34 +
 .../test/java/examples/GetHttpSessionSocket.java   |   47 +
 .../test/java/examples/MyAuthedConfigurator.java   |   48 +
 .../src/test/java/examples/MyAuthedSocket.java     |   33 +
 .../test/java/examples/StreamingEchoSocket.java    |   46 +
 .../jsr356/server/AnnotatedServerEndpointTest.java |  142 +
 .../websocket/jsr356/server/BasicEndpointTest.java |   89 +
 .../websocket/jsr356/server/BinaryStreamTest.java  |  177 +
 .../websocket/jsr356/server/ConfiguratorTest.java  |  508 ++
 .../websocket/jsr356/server/DummyConnection.java   |  162 +
 .../websocket/jsr356/server/DummyCreator.java      |   39 +
 .../jetty/websocket/jsr356/server/EchoCase.java    |  181 +
 .../websocket/jsr356/server/EchoClientSocket.java  |  123 +
 .../jetty/websocket/jsr356/server/EchoTest.java    |  302 ++
 .../server/ExtensionStackProcessingTest.java       |  184 +
 .../websocket/jsr356/server/IdleTimeoutTest.java   |  140 +
 .../websocket/jsr356/server/JettyEchoSocket.java   |  137 +
 .../JettyServerEndpointConfiguratorTest.java       |   53 +
 .../websocket/jsr356/server/JsrBatchModeTest.java  |  181 +
 .../jsr356/server/LargeAnnotatedTest.java          |   92 +
 .../jsr356/server/LargeContainerTest.java          |   92 +
 .../websocket/jsr356/server/MemoryUsageTest.java   |  134 +
 .../jsr356/server/OnMessageReturnTest.java         |   82 +
 .../websocket/jsr356/server/OnPartialTest.java     |  111 +
 .../websocket/jsr356/server/PingPongTest.java      |  199 +
 ...nnotatedEndpointScanner_GoodSignaturesTest.java |  202 +
 ...tatedEndpointScanner_InvalidSignaturesTest.java |  111 +
 .../websocket/jsr356/server/SessionAltConfig.java  |   55 +
 .../jsr356/server/SessionInfoEndpoint.java         |  102 +
 .../websocket/jsr356/server/SessionInfoSocket.java |   83 +
 .../jetty/websocket/jsr356/server/SessionTest.java |  244 +
 .../jetty/websocket/jsr356/server/StreamTest.java  |  348 ++
 .../websocket/jsr356/server/TextStreamTest.java    |  179 +
 .../websocket/jsr356/server/TrackingSocket.java    |  127 +
 .../jetty/websocket/jsr356/server/WSServer.java    |  199 +
 .../server/browser/JsrBrowserConfigurator.java     |   52 +
 .../jsr356/server/browser/JsrBrowserDebugTool.java |   98 +
 .../jsr356/server/browser/JsrBrowserSocket.java    |  228 +
 .../jsr356/server/pathmap/PathMappingsTest.java    |  110 +
 .../pathmap/WebSocketPathSpecBadSpecsTest.java     |   87 +
 .../server/pathmap/WebSocketPathSpecTest.java      |  286 +
 .../BasicBinaryMessageByteBufferSocket.java        |   37 +
 .../samples/BasicCloseReasonSessionSocket.java     |   37 +
 .../server/samples/BasicCloseReasonSocket.java     |   36 +
 .../samples/BasicCloseSessionReasonSocket.java     |   37 +
 .../jsr356/server/samples/BasicCloseSocket.java    |   35 +
 .../server/samples/BasicErrorSessionSocket.java    |   35 +
 .../samples/BasicErrorSessionThrowableSocket.java  |   36 +
 .../jsr356/server/samples/BasicErrorSocket.java    |   34 +
 .../samples/BasicErrorThrowableSessionSocket.java  |   36 +
 .../server/samples/BasicErrorThrowableSocket.java  |   35 +
 .../samples/BasicOpenCloseSessionSocket.java       |   46 +
 .../server/samples/BasicOpenCloseSocket.java       |   41 +
 .../server/samples/BasicOpenSessionSocket.java     |   35 +
 .../jsr356/server/samples/BasicOpenSocket.java     |   34 +
 .../server/samples/BasicPongMessageSocket.java     |   36 +
 .../samples/BasicTextMessageStringSocket.java      |   35 +
 .../server/samples/InvalidCloseIntSocket.java      |   37 +
 .../server/samples/InvalidErrorErrorSocket.java    |   37 +
 .../samples/InvalidErrorExceptionSocket.java       |   37 +
 .../server/samples/InvalidErrorIntSocket.java      |   37 +
 .../samples/InvalidOpenCloseReasonSocket.java      |   38 +
 .../server/samples/InvalidOpenIntSocket.java       |   37 +
 .../samples/InvalidOpenSessionIntSocket.java       |   38 +
 .../samples/StatelessTextMessageStringSocket.java  |   36 +
 .../jsr356/server/samples/beans/DateDecoder.java   |   62 +
 .../jsr356/server/samples/beans/DateEncoder.java   |   48 +
 .../server/samples/beans/DateTextSocket.java       |   70 +
 .../server/samples/beans/DateTimeDecoder.java      |   62 +
 .../server/samples/beans/DateTimeEncoder.java      |   48 +
 .../jsr356/server/samples/beans/TimeDecoder.java   |   62 +
 .../jsr356/server/samples/beans/TimeEncoder.java   |   48 +
 .../server/samples/binary/ByteBufferSocket.java    |   51 +
 .../server/samples/echo/BasicEchoEndpoint.java     |   46 +
 .../BasicEchoEndpointConfigContextListener.java    |   57 +
 .../echo/BasicEchoEndpointContextListener.java     |   57 +
 .../server/samples/echo/BasicEchoSocket.java       |   37 +
 .../echo/BasicEchoSocketConfigContextListener.java |   55 +
 .../echo/BasicEchoSocketContextListener.java       |   50 +
 .../server/samples/echo/ConfiguredEchoSocket.java  |  131 +
 .../server/samples/echo/EchoReturnEndpoint.java    |   64 +
 .../samples/echo/EchoSocketConfigurator.java       |   35 +
 .../samples/echo/LargeEchoConfiguredSocket.java    |   47 +
 .../samples/echo/LargeEchoContextListener.java     |   42 +
 .../samples/echo/LargeEchoDefaultSocket.java       |   37 +
 .../idletimeout/IdleTimeoutContextListener.java    |   54 +
 .../idletimeout/OnOpenIdleTimeoutEndpoint.java     |   44 +
 .../idletimeout/OnOpenIdleTimeoutSocket.java       |   40 +
 .../samples/partial/PartialTextSessionSocket.java  |   55 +
 .../server/samples/partial/PartialTextSocket.java  |   63 +
 .../samples/partial/PartialTrackingSocket.java     |   36 +
 .../server/samples/pong/PongContextListener.java   |   66 +
 .../server/samples/pong/PongMessageEndpoint.java   |   51 +
 .../jsr356/server/samples/pong/PongSocket.java     |   56 +
 .../primitives/BooleanObjectTextParamSocket.java   |   67 +
 .../primitives/BooleanObjectTextSocket.java        |   66 +
 .../samples/primitives/BooleanTextParamSocket.java |   60 +
 .../samples/primitives/BooleanTextSocket.java      |   59 +
 .../samples/primitives/ByteObjectTextSocket.java   |   66 +
 .../server/samples/primitives/ByteTextSocket.java  |   59 +
 .../server/samples/primitives/CharTextSocket.java  |   59 +
 .../primitives/CharacterObjectTextSocket.java      |   66 +
 .../samples/primitives/DoubleObjectTextSocket.java |   67 +
 .../samples/primitives/DoubleTextSocket.java       |   60 +
 .../samples/primitives/FloatObjectTextSocket.java  |   67 +
 .../server/samples/primitives/FloatTextSocket.java |   60 +
 .../samples/primitives/IntParamTextSocket.java     |   60 +
 .../server/samples/primitives/IntTextSocket.java   |   59 +
 .../primitives/IntegerObjectParamTextSocket.java   |   67 +
 .../primitives/IntegerObjectTextSocket.java        |   66 +
 .../samples/primitives/LongObjectTextSocket.java   |   66 +
 .../server/samples/primitives/LongTextSocket.java  |   59 +
 .../samples/primitives/ShortObjectTextSocket.java  |   66 +
 .../server/samples/primitives/ShortTextSocket.java |   59 +
 .../samples/streaming/InputStreamSocket.java       |   52 +
 .../samples/streaming/ReaderParamSocket.java       |   65 +
 .../server/samples/streaming/ReaderSocket.java     |   51 +
 .../streaming/StringReturnReaderParamSocket.java   |   56 +
 .../resources/basic-echo-endpoint-config-web.xml   |   12 +
 .../src/test/resources/data/larger.png             |  Bin 0 -> 134654 bytes
 .../src/test/resources/data/larger.png.sha         |    1 +
 .../src/test/resources/data/largest.jpg            |  Bin 0 -> 4443937 bytes
 .../src/test/resources/data/largest.jpg.sha        |    1 +
 .../src/test/resources/data/medium.png             |  Bin 0 -> 45443 bytes
 .../src/test/resources/data/medium.png.sha         |    1 +
 .../src/test/resources/data/small.png              |  Bin 0 -> 3142 bytes
 .../src/test/resources/data/small.png.sha          |    1 +
 .../src/test/resources/empty-web.xml               |    8 +
 .../src/test/resources/idle-timeout-config-web.xml |   12 +
 .../src/test/resources/jetty-logging.properties    |   11 +
 .../resources/jsr-browser-debug-tool/index.html    |   37 +
 .../test/resources/jsr-browser-debug-tool/main.css |   33 +
 .../resources/jsr-browser-debug-tool/websocket.js  |  139 +
 .../src/test/resources/large-echo-config-web.xml   |   12 +
 .../src/test/resources/pong-config-web.xml         |   12 +
 jetty-websocket/pom.xml                            |   99 +-
 .../eclipse/jetty/websocket/AbstractExtension.java |  149 -
 .../jetty/websocket/DeflateFrameExtension.java     |  164 -
 .../org/eclipse/jetty/websocket/Extension.java     |   31 -
 .../org/eclipse/jetty/websocket/FixedMaskGen.java  |   44 -
 .../eclipse/jetty/websocket/FragmentExtension.java |   80 -
 .../eclipse/jetty/websocket/IdentityExtension.java |   27 -
 .../java/org/eclipse/jetty/websocket/MaskGen.java  |   24 -
 .../org/eclipse/jetty/websocket/RandomMaskGen.java |   45 -
 .../org/eclipse/jetty/websocket/WebSocket.java     |  275 -
 .../eclipse/jetty/websocket/WebSocketBuffers.java  |   65 -
 .../eclipse/jetty/websocket/WebSocketClient.java   |  620 ---
 .../jetty/websocket/WebSocketClientFactory.java    |  596 ---
 .../jetty/websocket/WebSocketConnection.java       |   36 -
 .../jetty/websocket/WebSocketConnectionD00.java    |  514 --
 .../jetty/websocket/WebSocketConnectionD06.java    |  734 ---
 .../jetty/websocket/WebSocketConnectionD08.java    |  854 ---
 .../websocket/WebSocketConnectionRFC6455.java      |  995 ----
 .../eclipse/jetty/websocket/WebSocketFactory.java  |  465 --
 .../jetty/websocket/WebSocketGenerator.java        |   33 -
 .../jetty/websocket/WebSocketGeneratorD00.java     |  173 -
 .../jetty/websocket/WebSocketGeneratorD06.java     |  234 -
 .../jetty/websocket/WebSocketGeneratorD08.java     |  308 --
 .../jetty/websocket/WebSocketGeneratorRFC6455.java |  312 --
 .../eclipse/jetty/websocket/WebSocketHandler.java  |   57 -
 .../eclipse/jetty/websocket/WebSocketParser.java   |   53 -
 .../jetty/websocket/WebSocketParserD00.java        |  212 -
 .../jetty/websocket/WebSocketParserD06.java        |  310 --
 .../jetty/websocket/WebSocketParserD08.java        |  394 --
 .../jetty/websocket/WebSocketParserRFC6455.java    |  394 --
 .../eclipse/jetty/websocket/WebSocketServlet.java  |  128 -
 .../websocket/WebSocketServletConnection.java      |   28 -
 .../websocket/WebSocketServletConnectionD00.java   |  105 -
 .../websocket/WebSocketServletConnectionD06.java   |   63 -
 .../websocket/WebSocketServletConnectionD08.java   |   69 -
 .../WebSocketServletConnectionRFC6455.java         |   69 -
 .../org/eclipse/jetty/websocket/ZeroMaskGen.java   |   28 -
 .../jetty/websocket/SafariWebsocketDraft0Test.java |  129 -
 .../org/eclipse/jetty/websocket/TestClient.java    |  312 --
 .../org/eclipse/jetty/websocket/TestServer.java    |  448 --
 .../jetty/websocket/TomcatServerQuirksTest.java    |  125 -
 .../jetty/websocket/WebSocketClientTest.java       |  790 ---
 .../eclipse/jetty/websocket/WebSocketCommTest.java |  130 -
 .../jetty/websocket/WebSocketGeneratorD00Test.java |   94 -
 .../jetty/websocket/WebSocketGeneratorD06Test.java |  216 -
 .../jetty/websocket/WebSocketGeneratorD08Test.java |  215 -
 .../websocket/WebSocketGeneratorRFC6455Test.java   |  254 -
 .../jetty/websocket/WebSocketLoadD08Test.java      |  252 -
 .../jetty/websocket/WebSocketLoadRFC6455Test.java  |  247 -
 .../jetty/websocket/WebSocketMessageD00Test.java   |  816 ---
 .../jetty/websocket/WebSocketMessageD06Test.java   |  862 ---
 .../jetty/websocket/WebSocketMessageD08Test.java   | 1319 -----
 .../websocket/WebSocketMessageRFC6455Test.java     | 1665 ------
 .../jetty/websocket/WebSocketMinVersionTest.java   |  116 -
 .../jetty/websocket/WebSocketOverSSLTest.java      |  216 -
 .../jetty/websocket/WebSocketParserD00Test.java    |  159 -
 .../jetty/websocket/WebSocketParserD06Test.java    |  330 --
 .../jetty/websocket/WebSocketParserD08Test.java    |  370 --
 .../websocket/WebSocketParserRFC6455Test.java      |  409 --
 .../jetty/websocket/WebSocketRedeployTest.java     |  178 -
 .../jetty/websocket/WebSocketServletRFCTest.java   |  285 -
 .../eclipse/jetty/websocket/dummy/DummyServer.java |  309 --
 .../examples/EchoClientSocketExample.java          |  145 -
 .../examples/EchoServerSocketExample.java          |  140 -
 .../jetty/websocket/helper/CaptureSocket.java      |   57 -
 .../jetty/websocket/helper/MessageSender.java      |  104 -
 .../eclipse/jetty/websocket/helper/SafariD00.java  |  185 -
 .../websocket/helper/WebSocketCaptureServlet.java  |   49 -
 .../src/test/resources/jetty-logging.properties    |    4 -
 jetty-websocket/websocket-api/pom.xml              |   58 +
 .../jetty/websocket/api/BadPayloadException.java   |   44 +
 .../org/eclipse/jetty/websocket/api/BatchMode.java |   47 +
 .../jetty/websocket/api/CloseException.java        |   49 +
 .../eclipse/jetty/websocket/api/CloseStatus.java   |   81 +
 .../websocket/api/InvalidWebSocketException.java   |   43 +
 .../websocket/api/MessageTooLargeException.java    |   43 +
 .../websocket/api/PolicyViolationException.java    |   43 +
 .../jetty/websocket/api/ProtocolException.java     |   41 +
 .../jetty/websocket/api/RemoteEndpoint.java        |  137 +
 .../org/eclipse/jetty/websocket/api/Session.java   |  178 +
 .../eclipse/jetty/websocket/api/StatusCode.java    |  147 +
 .../eclipse/jetty/websocket/api/SuspendToken.java  |   30 +
 .../jetty/websocket/api/UpgradeException.java      |   62 +
 .../jetty/websocket/api/UpgradeRequest.java        |  362 ++
 .../jetty/websocket/api/UpgradeResponse.java       |  206 +
 .../jetty/websocket/api/WebSocketAdapter.java      |   82 +
 .../jetty/websocket/api/WebSocketBehavior.java     |   31 +
 .../jetty/websocket/api/WebSocketException.java    |   46 +
 .../jetty/websocket/api/WebSocketListener.java     |   80 +
 .../jetty/websocket/api/WebSocketPolicy.java       |  358 ++
 .../websocket/api/WebSocketTimeoutException.java   |   42 +
 .../eclipse/jetty/websocket/api/WriteCallback.java |   48 +
 .../api/annotations/OnWebSocketClose.java          |   44 +
 .../api/annotations/OnWebSocketConnect.java        |   43 +
 .../api/annotations/OnWebSocketError.java          |   45 +
 .../api/annotations/OnWebSocketFrame.java          |   44 +
 .../api/annotations/OnWebSocketMessage.java        |   58 +
 .../jetty/websocket/api/annotations/WebSocket.java |   43 +
 .../websocket/api/annotations/package-info.java    |   23 +
 .../jetty/websocket/api/extensions/Extension.java  |   89 +
 .../websocket/api/extensions/ExtensionConfig.java  |  250 +
 .../websocket/api/extensions/ExtensionFactory.java |   81 +
 .../jetty/websocket/api/extensions/Frame.java      |  118 +
 .../websocket/api/extensions/IncomingFrames.java   |   38 +
 .../websocket/api/extensions/OutgoingFrames.java   |   44 +
 .../websocket/api/extensions/package-info.java     |   23 +
 .../eclipse/jetty/websocket/api/package-info.java  |   23 +
 .../jetty/websocket/api/util/QuoteUtil.java        |  511 ++
 .../eclipse/jetty/websocket/api/util/WSURI.java    |  145 +
 .../jetty/websocket/api/util/package-info.java     |   23 +
 .../api/extensions/ExtensionConfigTest.java        |  124 +
 .../jetty/websocket/api/util/QuoteUtilTest.java    |  156 +
 .../websocket/api/util/QuoteUtil_QuoteTest.java    |   84 +
 .../jetty/websocket/api/util/WSURITest.java        |   88 +
 jetty-websocket/websocket-client/pom.xml           |  118 +
 .../websocket/client/ClientUpgradeRequest.java     |  273 +
 .../websocket/client/ClientUpgradeResponse.java    |   52 +
 .../jetty/websocket/client/WebSocketClient.java    |  584 +++
 .../jetty/websocket/client/io/ConnectPromise.java  |  107 +
 .../websocket/client/io/ConnectionManager.java     |  253 +
 .../websocket/client/io/UpgradeConnection.java     |  352 ++
 .../jetty/websocket/client/io/UpgradeListener.java |   32 +
 .../client/io/WebSocketClientConnection.java       |  116 +
 .../client/io/WebSocketClientSelectorManager.java  |  149 +
 .../jetty/websocket/client/io/package-info.java    |   23 +
 .../jetty/websocket/client/masks/FixedMasker.java  |   47 +
 .../jetty/websocket/client/masks/Masker.java       |   37 +
 .../jetty/websocket/client/masks/RandomMasker.java |   46 +
 .../jetty/websocket/client/masks/ZeroMasker.java   |   40 +
 .../jetty/websocket/client/masks/package-info.java |   23 +
 .../jetty/websocket/client/package-info.java       |   34 +
 .../src/test/java/examples/SimpleEchoClient.java   |   70 +
 .../src/test/java/examples/SimpleEchoSocket.java   |   87 +
 .../jetty/websocket/client/BadNetworkTest.java     |  131 +
 .../jetty/websocket/client/ClientCloseTest.java    |  635 +++
 .../jetty/websocket/client/ClientConnectTest.java  |  398 ++
 .../jetty/websocket/client/ClientWriteThread.java  |  107 +
 .../websocket/client/ConnectionManagerTest.java    |   82 +
 .../eclipse/jetty/websocket/client/CookieTest.java |  181 +
 .../websocket/client/JettyTrackingSocket.java      |  177 +
 .../jetty/websocket/client/MaxMessageSocket.java   |  102 +
 .../jetty/websocket/client/ServerReadThread.java   |  132 +
 .../jetty/websocket/client/ServerWriteThread.java  |   97 +
 .../jetty/websocket/client/SessionTest.java        |  111 +
 .../jetty/websocket/client/SlowClientTest.java     |  119 +
 .../jetty/websocket/client/SlowServerTest.java     |  160 +
 .../websocket/client/TomcatServerQuirksTest.java   |  128 +
 .../client/WebSocketClientBadUriTest.java          |  102 +
 .../websocket/client/WebSocketClientTest.java      |  377 ++
 .../websocket/client/examples/TestClient.java      |  312 ++
 .../src/test/resources/jetty-logging.properties    |   21 +
 jetty-websocket/websocket-common/pom.xml           |   82 +
 .../eclipse/jetty/websocket/common/AcceptHash.java |   61 +
 .../websocket/common/BlockingWriteCallback.java    |   86 +
 .../eclipse/jetty/websocket/common/CloseInfo.java  |  204 +
 .../jetty/websocket/common/ConnectionState.java    |   58 +
 .../eclipse/jetty/websocket/common/Generator.java  |  442 ++
 .../jetty/websocket/common/LogicalConnection.java  |  169 +
 .../org/eclipse/jetty/websocket/common/OpCode.java |  113 +
 .../org/eclipse/jetty/websocket/common/Parser.java |  660 +++
 .../jetty/websocket/common/SessionFactory.java     |   33 +
 .../jetty/websocket/common/SessionListener.java    |   31 +
 .../jetty/websocket/common/WebSocketFrame.java     |  388 ++
 .../websocket/common/WebSocketRemoteEndpoint.java  |  467 ++
 .../jetty/websocket/common/WebSocketSession.java   |  523 ++
 .../websocket/common/WebSocketSessionFactory.java  |   50 +
 .../common/events/AbstractEventDriver.java         |  252 +
 .../jetty/websocket/common/events/EventDriver.java |   65 +
 .../common/events/EventDriverFactory.java          |  147 +
 .../websocket/common/events/EventDriverImpl.java   |   58 +
 .../common/events/JettyAnnotatedEventDriver.java   |  234 +
 .../common/events/JettyAnnotatedImpl.java          |   65 +
 .../common/events/JettyAnnotatedMetadata.java      |   53 +
 .../common/events/JettyAnnotatedScanner.java       |  171 +
 .../common/events/JettyListenerEventDriver.java    |  136 +
 .../websocket/common/events/JettyListenerImpl.java |   44 +
 .../jetty/websocket/common/events/ParamList.java   |   33 +
 .../annotated/AbstractMethodAnnotationScanner.java |  194 +
 .../common/events/annotated/CallableMethod.java    |  144 +
 .../common/events/annotated/EventMethod.java       |  154 +
 .../common/events/annotated/EventMethods.java      |  105 +
 .../annotated/InvalidSignatureException.java       |   78 +
 .../annotated/OptionalSessionCallableMethod.java   |   91 +
 .../websocket/common/events/package-info.java      |   23 +
 .../common/extensions/AbstractExtension.java       |  209 +
 .../common/extensions/ExtensionStack.java          |  454 ++
 .../common/extensions/FrameDebugExtension.java     |  142 +
 .../extensions/WebSocketExtensionFactory.java      |   78 +
 .../extensions/compress/ByteAccumulator.java       |   79 +
 .../extensions/compress/CompressExtension.java     |  409 ++
 .../extensions/compress/DeflateFrameExtension.java |   72 +
 .../compress/PerMessageDeflateExtension.java       |  182 +
 .../compress/XWebkitDeflateFrameExtension.java     |   32 +
 .../common/extensions/compress/package-info.java   |   23 +
 .../extensions/fragment/FragmentExtension.java     |  217 +
 .../common/extensions/fragment/package-info.java   |   23 +
 .../extensions/identity/IdentityExtension.java     |   93 +
 .../common/extensions/identity/package-info.java   |   23 +
 .../websocket/common/extensions/package-info.java  |   23 +
 .../jetty/websocket/common/frames/BinaryFrame.java |   56 +
 .../jetty/websocket/common/frames/CloseFrame.java  |   48 +
 .../websocket/common/frames/ContinuationFrame.java |   54 +
 .../websocket/common/frames/ControlFrame.java      |  131 +
 .../jetty/websocket/common/frames/DataFrame.java   |   85 +
 .../jetty/websocket/common/frames/PingFrame.java   |   50 +
 .../jetty/websocket/common/frames/PongFrame.java   |   50 +
 .../jetty/websocket/common/frames/TextFrame.java   |   54 +
 .../common/io/AbstractWebSocketConnection.java     |  722 +++
 .../jetty/websocket/common/io/FrameFlusher.java    |  428 ++
 .../jetty/websocket/common/io/FramePipes.java      |   84 +
 .../websocket/common/io/FutureWriteCallback.java   |   48 +
 .../eclipse/jetty/websocket/common/io/IOState.java |  607 +++
 .../websocket/common/io/WriteCallbackWrapper.java  |   58 +
 .../io/http/HttpResponseHeaderParseListener.java   |   32 +
 .../common/io/http/HttpResponseHeaderParser.java   |  143 +
 .../jetty/websocket/common/io/package-info.java    |   23 +
 .../common/io/payload/DeMaskProcessor.java         |   80 +
 .../common/io/payload/PayloadProcessor.java        |   41 +
 .../websocket/common/io/payload/package-info.java  |   23 +
 .../websocket/common/message/MessageAppender.java  |   47 +
 .../common/message/MessageInputStream.java         |  197 +
 .../common/message/MessageOutputStream.java        |  219 +
 .../websocket/common/message/MessageReader.java    |   52 +
 .../websocket/common/message/MessageWriter.java    |  225 +
 .../common/message/SimpleBinaryMessage.java        |   70 +
 .../common/message/SimpleTextMessage.java          |   71 +
 .../websocket/common/message/Utf8CharBuffer.java   |  112 +
 .../websocket/common/message/package-info.java     |   23 +
 .../jetty/websocket/common/package-info.java       |   29 +
 .../jetty/websocket/common/util/ReflectUtils.java  |  395 ++
 .../jetty/websocket/common/util/TextUtil.java      |   84 +
 .../doc-files/websocket-stack-extensions.png       |  Bin 0 -> 71200 bytes
 .../doc-files/websocket-stack-extensions.svg       |  434 ++
 .../common/doc-files/websocket-stack-simple.png    |  Bin 0 -> 59981 bytes
 .../common/doc-files/websocket-stack-simple.svg    |  384 ++
 ...clipse.jetty.websocket.api.extensions.Extension |    5 +
 .../java/examples/AdapterConnectCloseSocket.java   |   40 +
 .../java/examples/AnnotatedBinaryArraySocket.java  |   51 +
 .../java/examples/AnnotatedBinaryStreamSocket.java |   56 +
 .../test/java/examples/AnnotatedFramesSocket.java  |   51 +
 .../java/examples/AnnotatedStreamingSocket.java    |   79 +
 .../test/java/examples/AnnotatedTextSocket.java    |   57 +
 .../java/examples/AnnotatedTextStreamSocket.java   |   52 +
 .../test/java/examples/ListenerBasicSocket.java    |   58 +
 .../test/java/examples/echo/AdapterEchoSocket.java |   47 +
 .../java/examples/echo/AnnotatedEchoSocket.java    |   41 +
 .../java/examples/echo/ListenerEchoSocket.java     |   65 +
 .../jetty/websocket/common/AcceptHashTest.java     |   62 +
 .../jetty/websocket/common/CloseInfoTest.java      |  166 +
 .../websocket/common/ClosePayloadParserTest.java   |   67 +
 .../common/GeneratorParserRoundtripTest.java       |  124 +
 .../jetty/websocket/common/GeneratorTest.java      |  319 ++
 .../eclipse/jetty/websocket/common/ParserTest.java |  255 +
 .../websocket/common/PingPayloadParserTest.java    |   58 +
 .../common/RFC6455ExamplesGeneratorTest.java       |  191 +
 .../common/RFC6455ExamplesParserTest.java          |  252 +
 .../websocket/common/TextPayloadParserTest.java    |  236 +
 .../jetty/websocket/common/WebSocketFrameTest.java |  140 +
 .../common/WebSocketRemoteEndpointTest.java        |   91 +
 .../jetty/websocket/common/ab/TestABCase1_1.java   |  517 ++
 .../jetty/websocket/common/ab/TestABCase1_2.java   |  536 ++
 .../jetty/websocket/common/ab/TestABCase2.java     |  323 ++
 .../jetty/websocket/common/ab/TestABCase3.java     |   92 +
 .../jetty/websocket/common/ab/TestABCase4.java     |  165 +
 .../jetty/websocket/common/ab/TestABCase7_3.java   |  349 ++
 .../annotations/BadBinarySignatureSocket.java      |   39 +
 .../annotations/BadDuplicateBinarySocket.java      |   49 +
 .../annotations/BadDuplicateFrameSocket.java       |   45 +
 .../common/annotations/BadTextSignatureSocket.java |   39 +
 .../websocket/common/annotations/FrameSocket.java  |   36 +
 .../common/annotations/MyEchoBinarySocket.java     |   45 +
 .../websocket/common/annotations/MyEchoSocket.java |   78 +
 .../common/annotations/MyStatelessEchoSocket.java  |   41 +
 .../websocket/common/annotations/NoopSocket.java   |   30 +
 .../websocket/common/annotations/NotASocket.java   |   36 +
 .../websocket/common/events/EventCapture.java      |   93 +
 .../common/events/EventDriverFactoryTest.java      |   85 +
 .../websocket/common/events/EventDriverTest.java   |  182 +
 .../common/events/JettyAnnotatedScannerTest.java   |  342 ++
 .../common/extensions/AbstractExtensionTest.java   |   44 +
 .../common/extensions/DummyIncomingFrames.java     |   56 +
 .../common/extensions/DummyOutgoingFrames.java     |   62 +
 .../common/extensions/ExtensionStackTest.java      |  189 +
 .../websocket/common/extensions/ExtensionTool.java |  136 +
 .../common/extensions/FragmentExtensionTest.java   |  313 ++
 .../common/extensions/IdentityExtensionTest.java   |  101 +
 .../extensions/compress/CapturedHexPayloads.java   |   49 +
 .../compress/DeflateFrameExtensionTest.java        |  437 ++
 .../compress/PerMessageDeflateExtensionTest.java   |  409 ++
 .../jetty/websocket/common/io/IOStateTest.java     |  245 +
 .../common/io/LocalWebSocketConnection.java        |  254 +
 .../websocket/common/io/LocalWebSocketSession.java |   58 +
 .../websocket/common/io/TrackingCallback.java      |   81 +
 .../io/http/HttpResponseHeaderParserTest.java      |  196 +
 .../common/io/http/HttpResponseParseCapture.java   |   75 +
 .../common/io/payload/DeMaskProcessorTest.java     |  109 +
 .../websocket/common/message/DummySocket.java      |   29 +
 .../websocket/common/message/MessageDebug.java     |   60 +
 .../common/message/MessageInputStreamTest.java     |  235 +
 .../common/message/MessageOutputStreamTest.java    |  139 +
 .../common/message/MessageWriterTest.java          |  139 +
 .../common/message/TrackingInputStreamSocket.java  |  112 +
 .../websocket/common/message/TrackingSocket.java   |  170 +
 .../common/message/Utf8CharBufferTest.java         |  125 +
 .../websocket/common/test/BlockheadClient.java     |  769 +++
 .../test/BlockheadClientConstructionTest.java      |   72 +
 .../websocket/common/test/BlockheadServer.java     |  696 +++
 .../websocket/common/test/ByteBufferAssert.java    |   68 +
 .../jetty/websocket/common/test/Fuzzed.java        |   32 +
 .../jetty/websocket/common/test/Fuzzer.java        |  343 ++
 .../jetty/websocket/common/test/HttpResponse.java  |   94 +
 .../common/test/IncomingFramesCapture.java         |  163 +
 .../common/test/LeakTrackingBufferPoolRule.java    |   61 +
 .../common/test/OutgoingFramesCapture.java         |   97 +
 .../common/test/OutgoingNetworkBytesCapture.java   |   77 +
 .../websocket/common/test/RawFrameBuilder.java     |  110 +
 .../jetty/websocket/common/test/UnitGenerator.java |  134 +
 .../jetty/websocket/common/test/UnitParser.java    |   73 +
 .../eclipse/jetty/websocket/common/util/Hex.java   |   80 +
 .../websocket/common/util/MaskedByteBuffer.java    |   50 +
 .../jetty/websocket/common/util/StackUtil.java     |   42 +
 .../src/test/resources/jetty-logging.properties    |    7 +
 .../src/test/resources/keystore                    |  Bin
 .../src/test/webapp/index.html                     |    0
 jetty-websocket/websocket-server/pom.xml           |  105 +
 .../jetty/websocket/server/HandshakeRFC6455.java   |   66 +
 .../websocket/server/MappedWebSocketCreator.java   |   33 +
 .../websocket/server/ServletWebSocketRequest.java  |   37 +
 .../websocket/server/ServletWebSocketResponse.java |   35 +
 .../jetty/websocket/server/WebSocketHandler.java   |  114 +
 .../jetty/websocket/server/WebSocketHandshake.java |   35 +
 .../server/WebSocketServerConnection.java          |   82 +
 .../websocket/server/WebSocketServerFactory.java   |  581 ++
 .../websocket/server/WebSocketUpgradeFilter.java   |  345 ++
 .../server/WebSocketUpgradeHandlerWrapper.java     |   99 +
 .../jetty/websocket/server/package-info.java       |   23 +
 .../websocket/server/pathmap/PathMappings.java     |  190 +
 .../jetty/websocket/server/pathmap/PathSpec.java   |  167 +
 .../websocket/server/pathmap/PathSpecGroup.java    |   82 +
 .../websocket/server/pathmap/RegexPathSpec.java    |  176 +
 .../websocket/server/pathmap/ServletPathSpec.java  |  291 ++
 ...jetty.websocket.servlet.WebSocketServletFactory |    1 +
 .../server/AnnotatedMaxMessageSizeTest.java        |  147 +
 .../jetty/websocket/server/BatchModeTest.java      |  103 +
 .../eclipse/jetty/websocket/server/ChromeTest.java |   84 +
 .../jetty/websocket/server/FirefoxTest.java        |   73 +
 .../websocket/server/FragmentExtensionTest.java    |  103 +
 .../server/FrameCompressionExtensionTest.java      |   94 +
 .../websocket/server/IdentityExtensionTest.java    |   83 +
 .../jetty/websocket/server/IdleTimeoutTest.java    |  107 +
 .../server/PerMessageDeflateExtensionTest.java     |  101 +
 .../jetty/websocket/server/RequestHeadersTest.java |  135 +
 .../websocket/server/SimpleServletServer.java      |  164 +
 .../jetty/websocket/server/TooFastClientTest.java  |  111 +
 .../jetty/websocket/server/WebSocketCloseTest.java |  217 +
 .../server/WebSocketInvalidVersionTest.java        |   71 +
 .../websocket/server/WebSocketOverSSLTest.java     |  189 +
 .../websocket/server/WebSocketProtocolTest.java    |   91 +
 .../server/WebSocketServerSessionTest.java         |  103 +
 .../websocket/server/WebSocketServletRFCTest.java  |  352 ++
 .../jetty/websocket/server/ab/ABServlet.java       |   44 +
 .../jetty/websocket/server/ab/ABSocket.java        |   83 +
 .../jetty/websocket/server/ab/AbstractABCase.java  |  228 +
 .../jetty/websocket/server/ab/TestABCase1.java     |  472 ++
 .../jetty/websocket/server/ab/TestABCase2.java     |  331 ++
 .../jetty/websocket/server/ab/TestABCase3.java     |  211 +
 .../jetty/websocket/server/ab/TestABCase4.java     |  284 +
 .../jetty/websocket/server/ab/TestABCase5.java     |  617 +++
 .../jetty/websocket/server/ab/TestABCase6.java     |  410 ++
 .../websocket/server/ab/TestABCase6_BadUTF.java    |  177 +
 .../websocket/server/ab/TestABCase6_GoodUTF.java   |  150 +
 .../jetty/websocket/server/ab/TestABCase7.java     |  346 ++
 .../server/ab/TestABCase7_BadStatusCodes.java      |  138 +
 .../server/ab/TestABCase7_GoodStatusCodes.java     |  132 +
 .../jetty/websocket/server/ab/TestABCase9.java     |  760 +++
 .../websocket/server/browser/BrowserDebugTool.java |  177 +
 .../websocket/server/browser/BrowserSocket.java    |  281 +
 .../websocket/server/examples/BasicEchoSocket.java |   65 +
 .../server/examples/MyCustomCreationServlet.java   |   79 +
 .../websocket/server/examples/MyEchoServlet.java   |   35 +
 .../websocket/server/examples/MyEchoSocket.java    |   54 +
 .../server/examples/echo/BigEchoSocket.java        |   67 +
 .../examples/echo/EchoBroadcastPingSocket.java     |  101 +
 .../server/examples/echo/EchoBroadcastSocket.java  |   68 +
 .../server/examples/echo/EchoCreator.java          |   68 +
 .../server/examples/echo/EchoFragmentSocket.java   |   79 +
 .../server/examples/echo/ExampleEchoServer.java    |  151 +
 .../websocket/server/examples/echo/LogSocket.java  |   93 +
 .../websocket/server/helper/CaptureSocket.java     |   61 +
 .../jetty/websocket/server/helper/EchoServlet.java |   46 +
 .../jetty/websocket/server/helper/EchoSocket.java  |   73 +
 .../jetty/websocket/server/helper/RFCServlet.java  |   32 +
 .../jetty/websocket/server/helper/RFCSocket.java   |   76 +
 .../jetty/websocket/server/helper/SafariD00.java   |  151 +
 .../websocket/server/helper/SessionServlet.java    |   32 +
 .../websocket/server/helper/SessionSocket.java     |  125 +
 .../server/helper/WebSocketCaptureServlet.java     |   44 +
 .../AnnotatedRuntimeOnConnectSocket.java           |   70 +
 .../server/misbehaving/BadSocketsServlet.java      |   56 +
 .../ListenerRuntimeOnConnectSocket.java            |   74 +
 .../server/misbehaving/MisbehavingClassTest.java   |  133 +
 .../server/pathmap/PathMappingsBenchmarkTest.java  |  226 +
 .../websocket/server/pathmap/PathMappingsTest.java |  119 +
 .../server/pathmap/RegexPathSpecTest.java          |  135 +
 .../server/pathmap/ServletPathSpecTest.java        |  188 +
 .../test/resources/browser-debug-tool/index.html   |   58 +
 .../src/test/resources/browser-debug-tool/main.css |   29 +
 .../test/resources/browser-debug-tool/websocket.js |  141 +
 .../src/test/resources/jetty-logging.properties    |   24 +
 .../websocket-server}/src/test/resources/keystore  |  Bin
 jetty-websocket/websocket-servlet/pom.xml          |   69 +
 .../websocket/servlet/ServletUpgradeRequest.java   |  303 ++
 .../websocket/servlet/ServletUpgradeResponse.java  |  128 +
 .../servlet/UpgradeHttpServletRequest.java         |  591 +++
 .../jetty/websocket/servlet/WebSocketCreator.java  |   42 +
 .../jetty/websocket/servlet/WebSocketServlet.java  |  169 +
 .../websocket/servlet/WebSocketServletFactory.java |  109 +
 .../jetty/websocket/servlet/package-info.java      |   31 +
 .../test/java/examples/MyAdvancedEchoCreator.java  |   57 +
 .../test/java/examples/MyAdvancedEchoServlet.java  |   39 +
 .../src/test/java/examples/MyAuthedCreator.java    |   60 +
 .../src/test/java/examples/MyAuthedServlet.java    |   32 +
 .../src/test/java/examples/MyBinaryEchoSocket.java |   39 +
 .../src/test/java/examples/MyEchoServlet.java      |   39 +
 .../src/test/java/examples/MyEchoSocket.java       |   37 +
 jetty-xml/pom.xml                                  |    6 +-
 .../java/org/eclipse/jetty/xml/XmlAppendable.java  |  166 +
 .../org/eclipse/jetty/xml/XmlConfiguration.java    |  525 +-
 .../main/java/org/eclipse/jetty/xml/XmlParser.java |  131 +-
 .../java/org/eclipse/jetty/xml/package-info.java   |   23 +
 .../org/eclipse/jetty/xml/configure_9_0.dtd        |  288 +
 .../jetty/xml/AnnotatedTestConfiguration.java      |   78 +
 .../eclipse/jetty/xml/ConstructorArgTestClass.java |    2 +-
 .../jetty/xml/DefaultTestConfiguration.java        |   74 +
 .../org/eclipse/jetty/xml/TestConfiguration.java   |   19 +-
 .../org/eclipse/jetty/xml/XmlAppendableTest.java   |   70 +
 .../eclipse/jetty/xml/XmlConfigurationTest.java    |  457 +-
 .../src/test/resources/jetty-logging.properties    |    3 +
 .../resources/org/eclipse/jetty/xml/configure.xml  |    5 +-
 .../resources/org/eclipse/jetty/xml/mortbay.xml    |    2 +-
 pom.xml                                            |  770 ++-
 settings.xml                                       |   21 -
 test-continuation-jetty6/pom.xml                   |   82 -
 .../jetty/continuation/ContinuationBase.java       |  428 --
 .../jetty/continuation/FauxContinuationTest.java   |   83 -
 .../Jetty6ContinuationBioFauxTest.java             |  156 -
 .../continuation/Jetty6ContinuationBioTest.java    |  156 -
 .../Jetty6ContinuationNioFauxTest.java             |  157 -
 .../continuation/Jetty6ContinuationNioTest.java    |  157 -
 .../jetty/continuation/TestProxyServer.java        |   57 -
 test-continuation/pom.xml                          |   38 -
 .../jetty/continuation/test/ContinuationBase.java  |  515 --
 .../jetty/continuation/ContinuationTest.java       |  186 -
 .../jetty/continuation/FauxContinuationTest.java   |  160 -
 test-jetty-nested/pom.xml                          |   30 -
 .../main/java/org/eclipse/jetty/nested/Dump.java   | 1021 ----
 .../eclipse/jetty/nested/NestedJettyServlet.java   |  143 -
 .../java/org/eclipse/jetty/nested/TestServlet.java |  203 -
 .../src/main/webapp/WEB-INF/jetty.xml              |   34 -
 test-jetty-nested/src/main/webapp/WEB-INF/web.xml  |   52 -
 test-jetty-nested/src/main/webapp/index.html       |    1 -
 .../src/main/webapp/nested/WEB-INF/web.xml         |   35 -
 .../src/main/webapp/nested/index.html              |    7 -
 .../org/eclipse/jetty/nested/NestedServer.java     |   47 -
 test-jetty-servlet/pom.xml                         |   24 -
 .../src/main/java/Jetty400Repro.java               |  146 -
 .../java/org/eclipse/jetty/testing/HttpTester.java |  619 ---
 .../org/eclipse/jetty/testing/ServletTester.java   |  385 --
 .../org/eclipse/jetty/testing/HttpTesterTest.java  |   79 -
 .../org/eclipse/jetty/testing/ServletTest.java     |  347 --
 test-jetty-webapp/pom.xml                          |  225 -
 .../assembly/embedded-jetty-web-for-webbundle.xml  |   93 -
 test-jetty-webapp/src/main/assembly/web-bundle.xml |   35 -
 .../config/contexts-available/move-context.xml     |   11 -
 .../main/config/contexts/test.d/override-web.xml   |   60 -
 .../src/main/config/contexts/test.xml              |   97 -
 .../src/main/config/etc/jetty-testrealm.xml        |   23 -
 .../src/main/config/etc/realm.properties           |   21 -
 .../src/main/java/com/acme/ChatServlet.java        |  192 -
 .../src/main/java/com/acme/CookieDump.java         |  143 -
 .../src/main/java/com/acme/Counter.java            |   41 -
 .../src/main/java/com/acme/Date2Tag.java           |   53 -
 .../src/main/java/com/acme/DateTag.java            |   70 -
 .../src/main/java/com/acme/DispatchServlet.java    |  282 -
 test-jetty-webapp/src/main/java/com/acme/Dump.java | 1020 ----
 .../src/main/java/com/acme/HelloWorld.java         |   70 -
 .../src/main/java/com/acme/LoginServlet.java       |   92 -
 .../src/main/java/com/acme/RegTest.java            |  194 -
 .../src/main/java/com/acme/RewriteServlet.java     |   74 -
 .../src/main/java/com/acme/SecureModeServlet.java  |  382 --
 .../src/main/java/com/acme/SessionDump.java        |  185 -
 .../src/main/java/com/acme/TestFilter.java         |  129 -
 .../src/main/java/com/acme/TestListener.java       |  180 -
 .../main/java/com/acme/WebSocketChatServlet.java   |   99 -
 .../src/main/webapp/META-INF/MANIFEST.MF           |   23 -
 .../src/main/webapp/WEB-INF/acme-taglib.tld        |   28 -
 .../src/main/webapp/WEB-INF/jetty-web.xml          |   14 -
 test-jetty-webapp/src/main/webapp/WEB-INF/web.xml  |  387 --
 test-jetty-webapp/src/main/webapp/auth.html        |   36 -
 test-jetty-webapp/src/main/webapp/chat/index.html  |   85 -
 test-jetty-webapp/src/main/webapp/index.html       |   62 -
 test-jetty-webapp/src/main/webapp/remote.html      |   32 -
 .../src/main/webapp/rewrite/index.html             |   13 -
 .../org/eclipse/jetty/DispatchServletTest.java     |  142 -
 .../test/java/org/eclipse/jetty/TestServer.java    |  209 -
 tests/pom.xml                                      |    8 +-
 tests/test-cdi/cdi-client/pom.xml                  |   37 +
 tests/test-cdi/cdi-webapp-it/pom.xml               |  215 +
 .../test/java/org/eclipse/jetty/tests/HelloIT.java |   41 +
 .../java/org/eclipse/jetty/tests/ServerInfoIT.java |   37 +
 .../cdi-webapp-it/src/test/scripts/setup-jetty.sh  |   19 +
 .../cdi-webapp-it/src/test/scripts/start-jetty.sh  |   17 +
 .../cdi-webapp-it/src/test/scripts/stop-jetty.sh   |   11 +
 tests/test-cdi/cdi-webapp/pom.xml                  |   56 +
 .../java/org/eclipse/jetty/tests/HelloServlet.java |   42 +
 .../org/eclipse/jetty/tests/ServerInfoServlet.java |   54 +
 .../cdi-webapp/src/main/webapp/WEB-INF/beans.xml   |    0
 .../cdi-webapp/src/main/webapp/WEB-INF/web.xml     |   18 +
 tests/test-cdi/pom.xml                             |   35 +
 tests/test-continuation/pom.xml                    |   62 +
 .../jetty/continuation/ContinuationBase.java       |  509 ++
 .../jetty/continuation/ContinuationTest.java       |  203 +
 .../jetty/continuation/FauxContinuationTest.java   |  156 +
 tests/test-integration/pom.xml                     |    7 +-
 .../org/eclipse/jetty/test/DefaultHandlerTest.java |   55 +-
 .../org/eclipse/jetty/test/DigestPostTest.java     |  136 +-
 .../test/jsp/JspAndDefaultWithAliasesTest.java     |   11 +-
 .../test/jsp/JspAndDefaultWithoutAliasesTest.java  |   12 +-
 .../test/monitor/JavaMonitorIntegrationTest.java   |  171 -
 .../eclipse/jetty/test/monitor/JmxServiceTest.java |  165 -
 .../jetty/test/monitor/ProgramConfigTest.java      |  184 -
 .../eclipse/jetty/test/monitor/XmlConfigTest.java  |  167 -
 .../jetty/test/rfcs/RFC2616BIOHttpTest.java        |   49 -
 .../jetty/test/rfcs/RFC2616BIOHttpsTest.java       |   50 -
 .../eclipse/jetty/test/rfcs/RFC2616BaseTest.java   |  514 +-
 .../jetty/test/rfcs/RFC2616NIOHttpTest.java        |    4 +-
 .../jetty/test/rfcs/RFC2616NIOHttpsTest.java       |    7 +-
 .../jetty/test/support/TestableJettyServer.java    |   27 +-
 .../test/support/rawhttp/HttpRequestTester.java    |  228 -
 .../support/rawhttp/HttpRequestTesterTest.java     |   31 +-
 .../test/support/rawhttp/HttpResponseTester.java   |  461 --
 .../support/rawhttp/HttpResponseTesterTest.java    |   66 +-
 .../jetty/test/support/rawhttp/HttpTesting.java    |  150 +-
 .../src/test/resources/BIOHttp.xml                 |   22 -
 .../src/test/resources/BIOHttps.xml                |   29 -
 .../src/test/resources/DefaultHandler.xml          |   51 +-
 .../src/test/resources/NIOHttp.xml                 |   38 +-
 .../src/test/resources/NIOHttps.xml                |   50 +-
 .../src/test/resources/RFC2616Base.xml             |  163 +-
 .../src/test/resources/RFC2616_Filters.xml         |    4 +-
 .../src/test/resources/RFC2616_Redirects.xml       |   16 +-
 .../src/test/resources/monitor/etc/jetty-jmx.xml   |   82 -
 .../src/test/resources/monitor/start.ini           |    7 -
 .../jetty/monitor/java-monitor-integration.xml     |   62 -
 .../jetty/monitor/jetty-monitor-service.xml        |   68 -
 .../eclipse/jetty/monitor/jetty-monitor-test.xml   |   65 -
 tests/test-integration/src/test/resources/ssl.xml  |   33 +
 .../webapp-contexts/RFC2616/rfc2616-webapp.xml     |    4 +-
 .../src/test/resources/webdefault.xml              |    2 +-
 tests/test-jmx/jmx-webapp-it/pom.xml               |  207 +
 .../java/org/eclipse/jetty/test/jmx/JmxIT.java     |  144 +
 .../java/org/eclipse/jetty/test/jmx/PingIT.java    |   41 +
 .../jmx-webapp-it/src/test/scripts/setup-jetty.sh  |   19 +
 .../jmx-webapp-it/src/test/scripts/start-jetty.sh  |   17 +
 .../jmx-webapp-it/src/test/scripts/stop-jetty.sh   |   11 +
 tests/test-jmx/jmx-webapp/pom.xml                  |   65 +
 .../eclipse/jetty/test/jmx/CommonComponent.java    |   49 +
 .../java/org/eclipse/jetty/test/jmx/Echoer.java    |   43 +
 .../jetty/test/jmx/MyContainerInitializer.java     |   46 +
 .../org/eclipse/jetty/test/jmx/PingServlet.java    |   64 +
 .../java/org/eclipse/jetty/test/jmx/Pinger.java    |   40 +
 .../eclipse/jetty/test/jmx/jmx/EchoerMBean.java    |   38 +
 .../eclipse/jetty/test/jmx/jmx/PingerMBean.java    |   51 +
 .../javax.servlet.ServletContainerInitializer      |    1 +
 .../jmx-webapp/src/main/webapp/WEB-INF/web.xml     |   34 +
 tests/test-jmx/pom.xml                             |   34 +
 tests/test-loginservice/pom.xml                    |   86 +-
 .../eclipse/jetty/DataSourceLoginServiceTest.java  |  204 +
 .../jetty/DatabaseLoginServiceTestServer.java      |  250 +
 .../org/eclipse/jetty/JdbcLoginServiceTest.java    |  467 +-
 .../src/test/resources/droptables.sql              |    6 +
 .../src/test/resources/jdbcrealm.properties        |    2 +-
 .../src/test/resources/jetty-logging.properties    |    3 +
 tests/test-quickstart/pom.xml                      |  182 +
 .../jetty/quickstart/PreconfigureJNDIWar.java      |   49 +
 .../jetty/quickstart/PreconfigureSpecWar.java      |   58 +
 .../quickstart/PreconfigureStandardTestWar.java    |   61 +
 .../jetty/quickstart/QuickStartJNDIWar.java        |   31 +
 .../jetty/quickstart/QuickStartSpecWar.java        |   30 +
 .../quickstart/QuickStartStandardTestWar.java      |   30 +
 .../eclipse/jetty/quickstart/QuickStartTest.java   |  179 +
 .../org/eclipse/jetty/quickstart/Quickstart.java   |   73 +
 .../src/test/resources/realm.properties            |   21 +
 .../src/test/resources/test-jndi.xml               |   60 +
 .../src/test/resources/test-spec.xml               |   39 +
 tests/test-quickstart/src/test/resources/test.xml  |   47 +
 tests/test-sessions/pom.xml                        |    3 +-
 tests/test-sessions/test-hash-sessions/pom.xml     |   20 +-
 .../jetty/server/session/HashTestServer.java       |    2 -
 .../jetty/server/session/IdleSessionTest.java      |   96 +-
 .../server/session/ProxySerializationTest.java     |   78 +
 .../jetty/server/session/SessionRenewTest.java     |   81 +
 tests/test-sessions/test-jdbc-sessions/pom.xml     |   19 +-
 .../session/ClientCrossContextSessionTest.java     |   16 +
 .../jetty/server/session/DirtyAttributeTest.java   |  225 +
 .../jetty/server/session/ImmortalSessionTest.java  |   16 +
 .../server/session/InvalidationSessionTest.java    |   17 +
 .../jetty/server/session/JdbcTestServer.java       |  111 +-
 .../jetty/server/session/LastAccessTimeTest.java   |   18 +-
 .../server/session/LocalSessionScavengingTest.java |   16 +
 .../server/session/MaxInactiveMigrationTest.java   |   36 +-
 .../session/ModifyMaxInactiveIntervalTest.java     |  145 +
 .../jetty/server/session/NewSessionTest.java       |   16 +
 .../jetty/server/session/OrphanedSessionTest.java  |   16 +
 .../server/session/ProxySerializationTest.java     |   58 +
 .../session/ReentrantRequestSessionTest.java       |   16 +
 .../session/ReloadedSessionMissingClassTest.java   |   32 +-
 .../jetty/server/session/SaveIntervalTest.java     |   49 +-
 .../session/ServerCrossContextSessionTest.java     |   16 +
 .../jetty/server/session/SessionExpiryTest.java    |  133 +-
 .../session/SessionInvalidateAndCreateTest.java    |   38 +
 .../jetty/server/session/SessionMigrationTest.java |   16 +
 .../jetty/server/session/SessionRenewTest.java     |   54 +
 .../server/session/SessionValueSavingTest.java     |   27 +-
 .../StopSessionManagerPreserveSessionTest.java     |   81 +
 .../server/session/WebAppObjectInSessionTest.java  |   18 +
 tests/test-sessions/test-mongodb-sessions/pom.xml  |   19 +-
 .../jetty/nosql/mongodb/AttributeNameTest.java     |  163 +
 .../jetty/nosql/mongodb/InvalidateSessionTest.java |   54 +
 .../jetty/nosql/mongodb/LastAccessTimeTest.java    |    1 -
 .../nosql/mongodb/LocalSessionScavengingTest.java  |   41 +
 .../jetty/nosql/mongodb/MongoTestServer.java       |    5 +-
 .../nosql/mongodb/PurgeInvalidSessionTest.java     |   57 +-
 .../jetty/nosql/mongodb/PurgeValidSessionTest.java |   27 +-
 .../mongodb/ServerCrossContextSessionTest.java     |    1 +
 .../jetty/nosql/mongodb/SessionExpiryTest.java     |   45 +
 .../mongodb/SessionInvalidateAndCreateTest.java    |   41 +
 .../jetty/nosql/mongodb/SessionMigrationTest.java  |   39 +
 .../jetty/nosql/mongodb/SessionRenewTest.java      |   39 +
 .../nosql/mongodb/SessionSavingValueTest.java      |   72 +-
 .../StopSessionManagerDeleteSessionTest.java       |  164 +
 .../StopSessionManagerPreserveSessionTest.java     |   98 +
 tests/test-sessions/test-sessions-common/pom.xml   |    2 +-
 .../AbstractClientCrossContextSessionTest.java     |   46 +-
 .../session/AbstractImmortalSessionTest.java       |   46 +-
 .../session/AbstractInvalidationSessionTest.java   |   72 +-
 .../server/session/AbstractLastAccessTimeTest.java |   85 +-
 .../server/session/AbstractLightLoadTest.java      |   57 +-
 .../AbstractLocalSessionScavengingTest.java        |   71 +-
 .../server/session/AbstractNewSessionTest.java     |   43 +-
 .../session/AbstractOrphanedSessionTest.java       |   42 +-
 .../session/AbstractProxySerializationTest.java    |  132 +
 .../AbstractReentrantRequestSessionTest.java       |   36 +-
 .../server/session/AbstractRemoveSessionTest.java  |   61 +-
 .../AbstractServerCrossContextSessionTest.java     |   25 +-
 .../server/session/AbstractSessionCookieTest.java  |   75 +-
 .../server/session/AbstractSessionExpiryTest.java  |   96 +-
 .../AbstractSessionInvalidateAndCreateTest.java    |  104 +-
 .../session/AbstractSessionMigrationTest.java      |   49 +-
 .../server/session/AbstractSessionRenewTest.java   |  162 +
 .../session/AbstractSessionValueSavingTest.java    |  104 +-
 ...tractStopSessionManagerPreserveSessionTest.java |  116 +
 .../jetty/server/session/AbstractTestServer.java   |    3 +-
 .../session/AbstractWebAppObjectInSessionTest.java |   53 +-
 .../src/main/resources/proxy-serialization.jar     |  Bin 0 -> 5378 bytes
 tests/test-webapps/pom.xml                         |    9 +-
 tests/test-webapps/test-dispatch-webapp/pom.xml    |   46 +
 .../src/main/java/com/acme/DispatchServlet.java    |  123 +
 .../src/main/webapp/WEB-INF/web.xml                |   24 +
 .../src/main/webapp/images}/jetty_banner.gif       |  Bin
 .../src/main/webapp/images/small_powered_by.gif    |  Bin 0 -> 4787 bytes
 .../src/main/webapp/index.html                     |   48 +
 .../src/main/webapp/stylesheet.css                 |    7 +
 tests/test-webapps/test-jaas-webapp/pom.xml        |   70 +
 .../test-jaas-webapp/src/main/assembly/config.xml  |   19 +
 .../src/main/config/demo-base/etc/login.conf       |    5 +
 .../src/main/config/demo-base/etc/login.properties |    1 +
 .../main/config/demo-base/webapps/test-jaas.xml    |   25 +
 .../src/main/webapp/WEB-INF/jetty-web.xml          |    8 +
 .../src/main/webapp/WEB-INF/web.xml                |   41 +
 .../test-jaas-webapp/src/main/webapp/auth.html     |   18 +
 .../test-jaas-webapp/src/main/webapp/authfail.html |   11 +
 .../src/main/webapp/images}/jetty_banner.gif       |  Bin
 .../src/main/webapp/images/small_powered_by.gif    |  Bin 0 -> 4787 bytes
 .../test-jaas-webapp/src/main/webapp/index.html    |   42 +
 .../test-jaas-webapp/src/main/webapp/login.html    |   18 +
 .../test-jaas-webapp/src/main/webapp/logout.jsp    |   21 +
 .../src/main/webapp/stylesheet.css                 |    7 +
 .../test-webapps/test-jetty-webapp}/jetty-chat.jmx |    0
 tests/test-webapps/test-jetty-webapp/pom.xml       |  270 +
 .../assembly/embedded-jetty-web-for-webbundle.xml  |   93 +
 .../src/main/assembly/web-bundle.xml               |   35 +
 .../config/demo-base/etc/demo-rewrite-rules.xml    |  104 +
 .../src/main/config/demo-base/etc/realm.properties |   21 +
 .../src/main/config/demo-base/etc/test-realm.xml   |   24 +
 .../src/main/config/demo-base/start.ini            |   23 +
 .../demo-base/webapps/test.d/override-web.xml      |   56 +
 .../src/main/config/demo-base/webapps/test.xml     |  112 +
 .../src/main/java/com/acme/ChatServlet.java        |  232 +
 .../src/main/java/com/acme/CookieDump.java         |  142 +
 .../src/main/java/com/acme/Counter.java            |   41 +
 .../src/main/java/com/acme/Date2Tag.java           |   53 +
 .../src/main/java/com/acme/DateTag.java            |   71 +
 .../src/main/java/com/acme/DispatchServlet.java    |  278 +
 .../src/main/java/com/acme/Dump.java               | 1038 ++++
 .../src/main/java/com/acme/HelloWorld.java         |   61 +
 .../src/main/java/com/acme/JavaxWebSocketChat.java |   88 +
 .../src/main/java/com/acme/LoginServlet.java       |   80 +
 .../src/main/java/com/acme/RegTest.java            |  194 +
 .../src/main/java/com/acme/RewriteServlet.java     |   77 +
 .../src/main/java/com/acme/SecureModeServlet.java  |  381 ++
 .../src/main/java/com/acme/SessionDump.java        |  184 +
 .../src/main/java/com/acme/TagListener.java        |    0
 .../src/main/java/com/acme/TestFilter.java         |  128 +
 .../src/main/java/com/acme/TestListener.java       |  226 +
 .../main/java/com/acme/WebSocketChatServlet.java   |  122 +
 .../src/main/resources/jetty-logging.properties    |    2 +
 .../src/main/webapp/WEB-INF/acme-taglib.tld        |   28 +
 .../src/main/webapp/WEB-INF/acme-taglib2.tld       |    0
 .../src/main/webapp/WEB-INF/jetty-web.xml          |   17 +
 .../src/main/webapp/WEB-INF/tags/panel.tag         |    0
 .../src/main/webapp/WEB-INF/web.xml                |  342 ++
 .../test-jetty-webapp/src/main/webapp/auth.html    |   36 +
 .../src/main/webapp/auth/file.txt                  |    0
 .../src/main/webapp/auth/relax.txt                 |    0
 .../src/main/webapp/auth2/index.html               |    0
 .../src/main/webapp/cgi-bin/hello.sh               |    0
 .../src/main/webapp/chat/index.html                |  165 +
 .../test-jetty-webapp}/src/main/webapp/d.txt       |    0
 .../test-jetty-webapp}/src/main/webapp/da.txt      |    0
 .../test-jetty-webapp}/src/main/webapp/da.txt.gz   |  Bin
 .../test-jetty-webapp}/src/main/webapp/dat.txt     |    0
 .../test-jetty-webapp}/src/main/webapp/data.txt    |    0
 .../test-jetty-webapp}/src/main/webapp/data.txt.gz |  Bin
 .../src/main/webapp/error404.html                  |    0
 .../test-jetty-webapp}/src/main/webapp/favicon.ico |  Bin
 .../test-jetty-webapp/src/main/webapp/index.html   |   72 +
 .../src/main/webapp/javax.websocket/index.html     |  112 +
 .../src/main/webapp/jetty_banner.gif               |  Bin
 .../src/main/webapp/jsp/bean1.jsp                  |    0
 .../src/main/webapp/jsp/bean2.jsp                  |    0
 .../src/main/webapp/jsp/dump.jsp                   |    0
 .../src/main/webapp/jsp/expr.jsp                   |    0
 .../src/main/webapp/jsp/foo/foo.jsp                |    0
 .../src/main/webapp/jsp/index.html                 |    0
 .../src/main/webapp/jsp/jstl.jsp                   |    0
 .../test-jetty-webapp}/src/main/webapp/jsp/tag.jsp |    0
 .../src/main/webapp/jsp/tag2.jsp                   |    0
 .../src/main/webapp/jsp/tagfile.jsp                |    0
 .../test-jetty-webapp}/src/main/webapp/logon.html  |    0
 .../src/main/webapp/logonError.html                |    0
 .../test-jetty-webapp/src/main/webapp/remote.html  |   32 +
 .../src/main/webapp/rewrite/index.html             |   13 +
 .../src/main/webapp/rewrite/info.html              |    0
 .../src/main/webapp/small_powered_by.gif           |  Bin 0 -> 4787 bytes
 .../src/main/webapp/ws/index.html                  |    0
 .../java/org/eclipse/jetty/ChatServletTest.java    |   94 +
 .../org/eclipse/jetty/DispatchServletTest.java     |  145 +
 .../test/java/org/eclipse/jetty/TestServer.java    |  219 +
 tests/test-webapps/test-jndi-webapp/pom.xml        |  149 +
 .../test-jndi-webapp/src/main/assembly/config.xml  |   34 +
 .../src/main/java/com/acme/JNDITest.java           |  160 +
 .../src/main/templates/env-definitions.xml         |   47 +
 .../src/main/templates/jetty-test-jndi-header.xml  |   42 +
 .../src/main/templates/plugin-context-header.xml   |   15 +
 .../src/main/webapp/WEB-INF/jetty-env.xml          |   34 +
 .../src/main/webapp/WEB-INF/jetty-web.xml          |    8 +
 .../src/main/webapp/WEB-INF/web.xml                |   61 +
 .../src/main/webapp/images}/jetty_banner.gif       |  Bin
 .../src/main/webapp/images/small_powered_by.gif    |  Bin 0 -> 4787 bytes
 .../test-jndi-webapp/src/main/webapp/index.html    |   46 +
 .../src/main/webapp/stylesheet.css                 |    7 +
 tests/test-webapps/test-mock-resources/pom.xml     |   90 +
 .../src/main/java/com/acme/MockDataSource.java     |  101 +
 .../src/main/java/com/acme/MockTransport.java      |   55 +
 .../main/java/com/acme/MockUserTransaction.java    |   82 +
 .../main/resources/META-INF/javaxmail.providers    |    1 +
 tests/test-webapps/test-proxy-webapp/pom.xml       |  104 +
 .../src/main/webapp/META-INF/MANIFEST.MF           |   21 +
 .../src/main/webapp/WEB-INF/jetty-web.xml          |    6 +
 .../src/main/webapp/WEB-INF/web.xml                |   49 +
 .../eclipse/jetty/TestTransparentProxyServer.java  |  140 +
 tests/test-webapps/test-servlet-spec/pom.xml       |   30 +
 .../test-container-initializer/pom.xml             |   69 +
 .../src/main/java/com/acme/initializer/Foo.java    |   33 +
 .../java/com/acme/initializer/FooInitializer.java  |  102 +
 .../javax.servlet.ServletContainerInitializer      |    1 +
 .../test-servlet-spec/test-spec-webapp/pom.xml     |  246 +
 .../test-spec-webapp/src/etc/realm.properties      |   21 +
 .../test-spec-webapp/src/main/assembly/config.xml  |   34 +
 .../src/main/assembly/web-bundle.xml               |   18 +
 .../main/java/com/acme/test/AnnotatedListener.java |  149 +
 .../main/java/com/acme/test/AnnotationTest.java    |  346 ++
 .../java/com/acme/test/AsyncListenerServlet.java   |  127 +
 .../src/main/java/com/acme/test/Bar.java           |   28 +
 .../src/main/java/com/acme/test/MultiPartTest.java |  120 +
 .../java/com/acme/test/RoleAnnotationTest.java     |   95 +
 .../main/java/com/acme/test/SecuredServlet.java    |   60 +
 .../src/main/java/com/acme/test/TestListener.java  |  235 +
 .../main/templates/annotations-context-header.xml  |   53 +
 .../src/main/templates/env-definitions.xml         |   19 +
 .../src/main/templates/plugin-context-header.xml   |   17 +
 .../src/main/webapp/WEB-INF/jetty-env.xml          |   17 +
 .../src/main/webapp/WEB-INF/jetty-web.xml          |    8 +
 .../src/main/webapp/WEB-INF/web.xml                |  104 +
 .../test-spec-webapp/src/main/webapp/authfail.html |   10 +
 .../src/main/webapp/images}/jetty_banner.gif       |  Bin
 .../src/main/webapp/images/small_powered_by.gif    |  Bin 0 -> 4787 bytes
 .../test-spec-webapp/src/main/webapp/index.html    |   66 +
 .../test-spec-webapp/src/main/webapp/login.html    |   19 +
 .../test-spec-webapp/src/main/webapp/logout.jsp    |   21 +
 .../src/main/webapp/stylesheet.css                 |    7 +
 .../src/main/webapp/stylesheet.css~                |    7 +
 .../test-spec-webapp/src/test/jetty-plugin-env.xml |   43 +
 .../test-servlet-spec/test-web-fragment/pom.xml    |   68 +
 .../java/com/acme/fragment/FragmentServlet.java    |   78 +
 .../META-INF/resources/fragmentA/index.html        |    8 +
 .../src/main/resources/META-INF/web-fragment.xml   |   39 +
 tests/test-webapps/test-webapp-rfc2616/pom.xml     |   22 +-
 3918 files changed, 316298 insertions(+), 166086 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git



More information about the pkg-java-commits mailing list