From 2162455b72d5a474bba47d5daf5543d46c2688be Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 11 Feb 2015 14:20:06 +1100 Subject: [PATCH] Removed SPDY and NPN Because jetty 9.3 is targetted for HTTP2, we have removed support for SPDY and NPN. --- aggregates/jetty-all-compact3/pom.xml | 14 - aggregates/jetty-all/pom.xml | 6 - examples/embedded/pom.xml | 14 +- .../eclipse/jetty/embedded}/Http2Server.java | 5 +- .../eclipse/jetty/embedded/SpdyConnector.java | 114 -- .../eclipse/jetty/embedded/SpdyServer.java | 210 --- .../src/main/resources}/docroot/push.html | 0 .../main/resources}/docroot/pushed/tile00.jpg | Bin .../main/resources}/docroot/pushed/tile01.jpg | Bin .../main/resources}/docroot/pushed/tile02.jpg | Bin .../main/resources}/docroot/pushed/tile03.jpg | Bin .../main/resources}/docroot/pushed/tile04.jpg | Bin .../main/resources}/docroot/pushed/tile05.jpg | Bin .../main/resources}/docroot/pushed/tile06.jpg | Bin .../main/resources}/docroot/pushed/tile07.jpg | Bin .../main/resources}/docroot/pushed/tile08.jpg | Bin .../main/resources}/docroot/pushed/tile09.jpg | Bin .../main/resources}/docroot/pushed/tile10.jpg | Bin .../main/resources}/docroot/pushed/tile11.jpg | Bin .../main/resources}/docroot/pushed/tile12.jpg | Bin .../main/resources}/docroot/pushed/tile13.jpg | Bin .../main/resources}/docroot/pushed/tile14.jpg | Bin .../main/resources}/docroot/pushed/tile15.jpg | Bin .../main/resources}/docroot/pushed/tile16.jpg | Bin .../main/resources}/docroot/pushed/tile17.jpg | Bin .../main/resources}/docroot/pushed/tile18.jpg | Bin .../main/resources}/docroot/pushed/tile19.jpg | Bin .../main/resources}/docroot/pushed/tile20.jpg | Bin .../main/resources}/docroot/pushed/tile21.jpg | Bin .../main/resources}/docroot/pushed/tile22.jpg | Bin .../main/resources}/docroot/pushed/tile23.jpg | Bin .../main/resources}/docroot/pushed/tile24.jpg | Bin .../main/resources}/docroot/pushed/tile25.jpg | Bin .../main/resources}/docroot/pushed/tile26.jpg | Bin .../main/resources}/docroot/pushed/tile27.jpg | Bin .../main/resources}/docroot/pushed/tile28.jpg | Bin .../main/resources}/docroot/pushed/tile29.jpg | Bin .../main/resources}/docroot/pushed/tile30.jpg | Bin .../main/resources}/docroot/pushed/tile31.jpg | Bin .../main/resources}/docroot/pushed/tile32.jpg | Bin .../main/resources}/docroot/pushed/tile33.jpg | Bin .../main/resources}/docroot/pushed/tile34.jpg | Bin .../main/resources}/docroot/pushed/tile35.jpg | Bin .../main/resources}/docroot/pushed/tile36.jpg | Bin .../main/resources}/docroot/pushed/tile37.jpg | Bin .../main/resources}/docroot/pushed/tile38.jpg | Bin .../main/resources}/docroot/pushed/tile39.jpg | Bin .../main/resources}/docroot/pushed/tile40.jpg | Bin .../main/resources}/docroot/pushed/tile41.jpg | Bin .../main/resources}/docroot/pushed/tile42.jpg | Bin .../main/resources}/docroot/pushed/tile43.jpg | Bin .../main/resources}/docroot/pushed/tile44.jpg | Bin .../main/resources}/docroot/pushed/tile45.jpg | Bin .../main/resources}/docroot/pushed/tile46.jpg | Bin .../main/resources}/docroot/pushed/tile47.jpg | Bin .../main/resources}/docroot/pushed/tile48.jpg | Bin .../main/resources}/docroot/pushed/tile49.jpg | Bin .../main/resources}/docroot/tiles/tile00.jpg | Bin .../main/resources}/docroot/tiles/tile01.jpg | Bin .../main/resources}/docroot/tiles/tile02.jpg | Bin .../main/resources}/docroot/tiles/tile03.jpg | Bin .../main/resources}/docroot/tiles/tile04.jpg | Bin .../main/resources}/docroot/tiles/tile05.jpg | Bin .../main/resources}/docroot/tiles/tile06.jpg | Bin .../main/resources}/docroot/tiles/tile07.jpg | Bin .../main/resources}/docroot/tiles/tile08.jpg | Bin .../main/resources}/docroot/tiles/tile09.jpg | Bin .../main/resources}/docroot/tiles/tile10.jpg | Bin .../main/resources}/docroot/tiles/tile11.jpg | Bin .../main/resources}/docroot/tiles/tile12.jpg | Bin .../main/resources}/docroot/tiles/tile13.jpg | Bin .../main/resources}/docroot/tiles/tile14.jpg | Bin .../main/resources}/docroot/tiles/tile15.jpg | Bin .../main/resources}/docroot/tiles/tile16.jpg | Bin .../main/resources}/docroot/tiles/tile17.jpg | Bin .../main/resources}/docroot/tiles/tile18.jpg | Bin .../main/resources}/docroot/tiles/tile19.jpg | Bin .../main/resources}/docroot/tiles/tile20.jpg | Bin .../main/resources}/docroot/tiles/tile21.jpg | Bin .../main/resources}/docroot/tiles/tile22.jpg | Bin .../main/resources}/docroot/tiles/tile23.jpg | Bin .../main/resources}/docroot/tiles/tile24.jpg | Bin .../main/resources}/docroot/tiles/tile25.jpg | Bin .../main/resources}/docroot/tiles/tile26.jpg | Bin .../main/resources}/docroot/tiles/tile27.jpg | Bin .../main/resources}/docroot/tiles/tile28.jpg | Bin .../main/resources}/docroot/tiles/tile29.jpg | Bin .../main/resources}/docroot/tiles/tile30.jpg | Bin .../main/resources}/docroot/tiles/tile31.jpg | Bin .../main/resources}/docroot/tiles/tile32.jpg | Bin .../main/resources}/docroot/tiles/tile33.jpg | Bin .../main/resources}/docroot/tiles/tile34.jpg | Bin .../main/resources}/docroot/tiles/tile35.jpg | Bin .../main/resources}/docroot/tiles/tile36.jpg | Bin .../main/resources}/docroot/tiles/tile37.jpg | Bin .../main/resources}/docroot/tiles/tile38.jpg | Bin .../main/resources}/docroot/tiles/tile39.jpg | Bin .../main/resources}/docroot/tiles/tile40.jpg | Bin .../main/resources}/docroot/tiles/tile41.jpg | Bin .../main/resources}/docroot/tiles/tile42.jpg | Bin .../main/resources}/docroot/tiles/tile43.jpg | Bin .../main/resources}/docroot/tiles/tile44.jpg | Bin .../main/resources}/docroot/tiles/tile45.jpg | Bin .../main/resources}/docroot/tiles/tile46.jpg | Bin .../main/resources}/docroot/tiles/tile47.jpg | Bin .../main/resources}/docroot/tiles/tile48.jpg | Bin .../main/resources}/docroot/tiles/tile49.jpg | Bin jetty-ant/pom.xml | 2 +- jetty-distribution/pom.xml | 54 +- jetty-fcgi/fcgi-server/pom.xml | 113 +- .../proxy/DrupalSPDYFastCGIProxyServer.java | 38 +- .../WordPressSPDYFastCGIProxyServer.java | 42 +- jetty-npn/jetty-npn-client/pom.xml | 65 - .../jetty/npn/client/NPNClientConnection.java | 82 - .../client/NPNClientConnectionFactory.java | 50 - jetty-npn/jetty-npn-server/pom.xml | 54 - .../src/main/config/etc/protonego-npn.xml | 32 - .../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 - .../config/modules/protonego-impl/npn.mod | 38 - .../jetty/npn/server/NPNServerConnection.java | 68 - .../server/NPNServerConnectionFactory.java | 66 - .../jetty/npn/server/NPNModuleTest.java | 121 -- jetty-npn/pom.xml | 15 - jetty-osgi/jetty-osgi-npn/pom.xml | 40 - jetty-osgi/pom.xml | 13 +- jetty-osgi/test-jetty-osgi/pom.xml | 27 +- .../main/resources/jetty-logging.properties | 1 - .../src/test/config/etc/jetty-spdy.xml | 32 - .../src/test/config/etc/jetty-ssl.xml | 2 +- ...tSpdy.java => TestJettyOSGiBootHTTP2.java} | 20 +- jetty-spdy/pom.xml | 76 - jetty-spdy/spdy-alpn-tests/pom.xml | 97 - .../spdy/server/ALPNNegotiationTest.java | 198 -- .../jetty/spdy/server/ALPNSynReplyTest.java | 149 -- .../jetty/spdy/server/AbstractALPNTest.java | 78 - .../test/resources/jetty-logging.properties | 2 - .../src/test/resources/keystore.jks | Bin 2206 -> 0 bytes .../src/test/resources/truststore.jks | Bin 916 -> 0 bytes jetty-spdy/spdy-client/pom.xml | 75 - .../client/FlowControlStrategyFactory.java | 43 - .../eclipse/jetty/spdy/client/SPDYClient.java | 442 ----- .../client/SPDYClientConnectionFactory.java | 98 - .../jetty/spdy/client/SPDYConnection.java | 191 -- jetty-spdy/spdy-core/pom.xml | 56 - .../jetty/spdy/CompressionDictionary.java | 87 - .../jetty/spdy/CompressionFactory.java | 46 - .../org/eclipse/jetty/spdy/Controller.java | 30 - .../jetty/spdy/FlowControlStrategy.java | 92 - .../java/org/eclipse/jetty/spdy/Flusher.java | 266 --- .../java/org/eclipse/jetty/spdy/ISession.java | 39 - .../java/org/eclipse/jetty/spdy/IStream.java | 120 -- .../org/eclipse/jetty/spdy/IdleListener.java | 24 - .../org/eclipse/jetty/spdy/PushSynInfo.java | 60 - .../jetty/spdy/SPDYv3FlowControlStrategy.java | 90 - .../eclipse/jetty/spdy/SessionException.java | 48 - .../spdy/StandardCompressionFactory.java | 92 - .../eclipse/jetty/spdy/StandardSession.java | 1303 ------------- .../eclipse/jetty/spdy/StandardStream.java | 602 ------ .../eclipse/jetty/spdy/StreamException.java | 50 - .../jetty/spdy/api/ByteBufferDataInfo.java | 90 - .../eclipse/jetty/spdy/api/BytesDataInfo.java | 83 - .../org/eclipse/jetty/spdy/api/DataInfo.java | 264 --- .../eclipse/jetty/spdy/api/GoAwayInfo.java | 38 - .../jetty/spdy/api/GoAwayResultInfo.java | 57 - .../eclipse/jetty/spdy/api/HeadersInfo.java | 135 -- .../java/org/eclipse/jetty/spdy/api/Info.java | 52 - .../org/eclipse/jetty/spdy/api/PingInfo.java | 38 - .../jetty/spdy/api/PingResultInfo.java | 44 - .../org/eclipse/jetty/spdy/api/PushInfo.java | 101 - .../org/eclipse/jetty/spdy/api/ReplyInfo.java | 107 -- .../org/eclipse/jetty/spdy/api/RstInfo.java | 78 - .../java/org/eclipse/jetty/spdy/api/SPDY.java | 39 - .../eclipse/jetty/spdy/api/SPDYException.java | 50 - .../org/eclipse/jetty/spdy/api/Session.java | 261 --- .../jetty/spdy/api/SessionFrameListener.java | 163 -- .../eclipse/jetty/spdy/api/SessionStatus.java | 68 - .../org/eclipse/jetty/spdy/api/Settings.java | 228 --- .../eclipse/jetty/spdy/api/SettingsInfo.java | 61 - .../org/eclipse/jetty/spdy/api/Stream.java | 237 --- .../jetty/spdy/api/StreamFrameListener.java | 110 -- .../eclipse/jetty/spdy/api/StreamStatus.java | 128 -- .../jetty/spdy/api/StringDataInfo.java | 38 - .../org/eclipse/jetty/spdy/api/SynInfo.java | 128 -- .../server/ServerSessionFrameListener.java | 50 - .../jetty/spdy/frames/ControlFrame.java | 56 - .../jetty/spdy/frames/ControlFrameType.java | 59 - .../jetty/spdy/frames/CredentialFrame.java | 51 - .../eclipse/jetty/spdy/frames/DataFrame.java | 63 - .../jetty/spdy/frames/GoAwayFrame.java | 51 - .../jetty/spdy/frames/HeadersFrame.java | 61 - .../eclipse/jetty/spdy/frames/NoOpFrame.java | 29 - .../eclipse/jetty/spdy/frames/PingFrame.java | 41 - .../jetty/spdy/frames/RstStreamFrame.java | 51 - .../jetty/spdy/frames/SettingsFrame.java | 49 - .../jetty/spdy/frames/SynReplyFrame.java | 56 - .../jetty/spdy/frames/SynStreamFrame.java | 83 - .../jetty/spdy/frames/WindowUpdateFrame.java | 48 - .../spdy/generator/ControlFrameGenerator.java | 51 - .../spdy/generator/CredentialGenerator.java | 87 - .../spdy/generator/DataFrameGenerator.java | 57 - .../jetty/spdy/generator/Generator.java | 63 - .../jetty/spdy/generator/GoAwayGenerator.java | 67 - .../spdy/generator/HeadersBlockGenerator.java | 150 -- .../spdy/generator/HeadersGenerator.java | 76 - .../jetty/spdy/generator/NoOpGenerator.java | 49 - .../jetty/spdy/generator/PingGenerator.java | 51 - .../spdy/generator/RstStreamGenerator.java | 52 - .../spdy/generator/SettingsGenerator.java | 91 - .../spdy/generator/SynReplyGenerator.java | 104 -- .../spdy/generator/SynStreamGenerator.java | 94 - .../spdy/generator/WindowUpdateGenerator.java | 52 - .../spdy/parser/ControlFrameBodyParser.java | 26 - .../jetty/spdy/parser/ControlFrameParser.java | 213 --- .../spdy/parser/CredentialBodyParser.java | 274 --- .../jetty/spdy/parser/DataFrameParser.java | 155 -- .../jetty/spdy/parser/GoAwayBodyParser.java | 159 -- .../jetty/spdy/parser/HeadersBlockParser.java | 230 --- .../jetty/spdy/parser/HeadersBodyParser.java | 173 -- .../jetty/spdy/parser/NoOpBodyParser.java | 41 - .../org/eclipse/jetty/spdy/parser/Parser.java | 240 --- .../jetty/spdy/parser/PingBodyParser.java | 98 - .../spdy/parser/RstStreamBodyParser.java | 127 -- .../jetty/spdy/parser/SettingsBodyParser.java | 200 -- .../jetty/spdy/parser/SynReplyBodyParser.java | 184 -- .../spdy/parser/SynStreamBodyParser.java | 236 --- .../parser/UnknownControlFrameBodyParser.java | 72 - .../spdy/parser/WindowUpdateBodyParser.java | 127 -- .../eclipse/jetty/spdy/AsyncTimeoutTest.java | 159 -- .../jetty/spdy/StandardSessionTest.java | 681 ------- .../jetty/spdy/StandardStreamTest.java | 258 --- .../jetty/spdy/api/ClientUsageTest.java | 260 --- .../jetty/spdy/api/ServerUsageTest.java | 121 -- .../frames/CredentialGenerateParseTest.java | 104 -- .../spdy/frames/DataGenerateParseTest.java | 144 -- .../spdy/frames/GoAwayGenerateParseTest.java | 85 - .../spdy/frames/HeadersGenerateParseTest.java | 103 -- .../spdy/frames/NoOpGenerateParseTest.java | 74 - .../spdy/frames/PingGenerateParseTest.java | 81 - .../frames/RstStreamGenerateParseTest.java | 92 - .../frames/SettingsGenerateParseTest.java | 89 - .../frames/SynReplyGenerateParseTest.java | 91 - .../frames/SynStreamGenerateParseTest.java | 105 -- .../spdy/frames/TestSPDYParserListener.java | 70 - .../frames/WindowUpdateGenerateParseTest.java | 85 - .../generator/DataFrameGeneratorTest.java | 110 -- .../jetty/spdy/parser/BrokenFrameTest.java | 287 --- .../parser/LiveChromiumRequestParserTest.java | 100 - .../parser/ParseVersusCacheBenchmarkTest.java | 90 - .../spdy/parser/UnknownControlFrameTest.java | 82 - .../test/resources/jetty-logging.properties | 2 - .../spdy-core/src/test/resources/keystore.jks | Bin 2206 -> 0 bytes .../src/test/resources/truststore.jks | Bin 916 -> 0 bytes jetty-spdy/spdy-example-webapp/pom.xml | 87 - .../main/config/example-jetty-spdy-proxy.xml | 147 -- .../src/main/config/example-jetty-spdy.xml | 138 -- .../main/resources/jetty-logging.properties | 2 - .../src/main/resources/keystore.jks | Bin 2206 -> 0 bytes .../src/main/resources/truststore.jks | Bin 916 -> 0 bytes .../src/main/webapp/WEB-INF/web.xml | 6 - .../src/main/webapp/form.jsp | 3 - .../src/main/webapp/included.jsp | 3 - .../src/main/webapp/index.jsp | 37 - .../src/main/webapp/logo.jpg | Bin 5748 -> 0 bytes .../src/main/webapp/stylesheet.css | 9 - jetty-spdy/spdy-http-client-transport/pom.xml | 70 - .../spdy/client/http/HttpChannelOverSPDY.java | 85 - .../http/HttpClientTransportOverSPDY.java | 107 -- .../client/http/HttpConnectionOverSPDY.java | 80 - .../client/http/HttpDestinationOverSPDY.java | 38 - .../client/http/HttpReceiverOverSPDY.java | 152 -- .../spdy/client/http/HttpSenderOverSPDY.java | 118 -- .../http/AbstractHttpClientServerTest.java | 107 -- .../spdy/client/http/EmptyServerHandler.java | 37 - .../http/HttpClientCustomProxyTest.java | 261 --- .../spdy/client/http/HttpClientTest.java | 467 ----- .../test/resources/jetty-logging.properties | 4 - .../src/test/resources/keystore.jks | Bin 2206 -> 0 bytes .../src/test/resources/truststore.jks | Bin 916 -> 0 bytes jetty-spdy/spdy-http-common/pom.xml | 48 - .../jetty/spdy/http/HTTPSPDYHeader.java | 82 - jetty-spdy/spdy-http-server/pom.xml | 111 -- .../src/main/config/etc/jetty-spdy-proxy.xml | 158 -- .../src/main/config/etc/jetty-spdy.xml | 60 - .../src/main/config/modules/spdy.mod | 21 - .../http/HTTPSPDYServerConnectionFactory.java | 166 -- .../server/http/HTTPSPDYServerConnector.java | 82 - .../spdy/server/http/HttpChannelOverSPDY.java | 186 -- .../spdy/server/http/HttpInputOverSPDY.java | 59 - .../server/http/HttpTransportOverSPDY.java | 439 ----- .../jetty/spdy/server/http/PushStrategy.java | 55 - .../server/http/ReferrerPushStrategy.java | 342 ---- .../spdy/server/proxy/HTTPProxyEngine.java | 276 --- .../proxy/HTTPSPDYProxyServerConnector.java | 63 - .../jetty/spdy/server/proxy/ProxyEngine.java | 129 -- .../server/proxy/ProxyEngineSelector.java | 203 -- .../proxy/ProxyHTTPConnectionFactory.java | 57 - .../server/proxy/ProxyHTTPSPDYConnection.java | 378 ---- .../spdy/server/proxy/SPDYProxyEngine.java | 631 ------- .../server/http/AbstractHTTPSPDYTest.java | 136 -- .../server/http/ConcurrentStreamsTest.java | 128 -- .../http/HttpTransportOverSPDYTest.java | 289 --- .../http/PushStrategyBenchmarkTest.java | 397 ---- .../server/http/ReferrerPushStrategyTest.java | 1138 ------------ .../http/ReferrerPushStrategyUnitTest.java | 149 -- .../jetty/spdy/server/http/SPDYTestUtils.java | 51 - .../server/http/SSLExternalServerTest.java | 108 -- .../spdy/server/http/ServerHTTPSPDYTest.java | 1625 ----------------- .../server/http/SimpleHTTPBenchmarkTest.java | 160 -- .../server/proxy/ProxyHTTPToSPDYTest.java | 408 ----- .../server/proxy/ProxySPDYToHTTPLoadTest.java | 320 ---- .../server/proxy/ProxySPDYToHTTPTest.java | 546 ------ .../server/proxy/ProxySPDYToSPDYLoadTest.java | 275 --- .../server/proxy/ProxySPDYToSPDYTest.java | 553 ------ .../src/test/resources/big_script.js | 791 -------- .../test/resources/jetty-logging.properties | 10 - .../src/test/resources/keystore.jks | Bin 2206 -> 0 bytes .../src/test/resources/truststore.jks | Bin 916 -> 0 bytes jetty-spdy/spdy-npn-tests/pom.xml | 102 -- .../jetty/spdy/server/AbstractNPNTest.java | 77 - .../jetty/spdy/server/NPNNegotiationTest.java | 207 --- .../jetty/spdy/server/SSLEngineLeakTest.java | 71 - .../jetty/spdy/server/SSLSynReplyTest.java | 150 -- .../proxy/NPNProxySPDYToHTTPLoadTest.java | 29 - .../server/proxy/NPNProxySPDYToHTTPTest.java | 27 - .../proxy/NPNProxySPDYToSPDYLoadTest.java | 27 - .../server/proxy/NPNProxySPDYToSPDYTest.java | 27 - .../test/resources/jetty-logging.properties | 2 - .../src/test/resources/keystore.jks | Bin 2206 -> 0 bytes .../src/test/resources/truststore.jks | Bin 916 -> 0 bytes jetty-spdy/spdy-server/pom.xml | 81 - .../server/SPDYServerConnectionFactory.java | 212 --- .../spdy/server/SPDYServerConnector.java | 53 - .../jetty/spdy/server/AbstractTest.java | 151 -- .../jetty/spdy/server/ClosedStreamTest.java | 273 --- .../jetty/spdy/server/FlowControlTest.java | 493 ----- .../eclipse/jetty/spdy/server/GoAwayTest.java | 234 --- .../jetty/spdy/server/HeadersTest.java | 86 - .../jetty/spdy/server/IdleTimeoutTest.java | 257 --- .../spdy/server/MaxConcurrentStreamTest.java | 121 -- .../eclipse/jetty/spdy/server/PingTest.java | 106 -- .../spdy/server/ProtocolViolationsTest.java | 185 -- .../jetty/spdy/server/PushStreamTest.java | 591 ------ .../jetty/spdy/server/ResetStreamTest.java | 204 --- .../spdy/server/SPDYClientFactoryTest.java | 75 - .../spdy/server/SPDYServerConnectorTest.java | 70 - .../jetty/spdy/server/SettingsTest.java | 168 -- .../spdy/server/SynDataReplyDataLoadTest.java | 295 --- .../jetty/spdy/server/SynReplyTest.java | 375 ---- .../spdy/server/UnsupportedVersionTest.java | 100 - .../test/resources/jetty-logging.properties | 2 - pom.xml | 15 - tests/test-webapps/test-jetty-webapp/pom.xml | 6 - tests/test-webapps/test-proxy-webapp/pom.xml | 24 +- .../jetty/TestTransparentProxyServer.java | 40 +- 376 files changed, 189 insertions(+), 33529 deletions(-) rename {jetty-http2/http2-server/src/test/java/org/eclipse/jetty/http2/server => examples/embedded/src/main/java/org/eclipse/jetty/embedded}/Http2Server.java (97%) delete mode 100644 examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyConnector.java delete mode 100644 examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/push.html (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile00.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile01.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile02.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile03.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile04.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile05.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile06.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile07.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile08.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile09.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile10.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile11.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile12.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile13.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile14.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile15.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile16.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile17.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile18.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile19.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile20.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile21.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile22.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile23.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile24.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile25.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile26.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile27.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile28.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile29.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile30.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile31.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile32.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile33.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile34.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile35.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile36.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile37.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile38.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile39.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile40.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile41.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile42.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile43.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile44.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile45.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile46.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile47.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile48.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/pushed/tile49.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile00.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile01.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile02.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile03.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile04.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile05.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile06.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile07.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile08.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile09.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile10.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile11.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile12.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile13.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile14.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile15.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile16.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile17.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile18.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile19.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile20.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile21.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile22.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile23.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile24.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile25.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile26.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile27.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile28.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile29.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile30.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile31.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile32.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile33.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile34.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile35.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile36.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile37.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile38.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile39.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile40.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile41.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile42.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile43.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile44.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile45.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile46.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile47.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile48.jpg (100%) rename {jetty-http2/http2-server/src/test => examples/embedded/src/main/resources}/docroot/tiles/tile49.jpg (100%) delete mode 100644 jetty-npn/jetty-npn-client/pom.xml delete mode 100644 jetty-npn/jetty-npn-client/src/main/java/org/eclipse/jetty/npn/client/NPNClientConnection.java delete mode 100644 jetty-npn/jetty-npn-client/src/main/java/org/eclipse/jetty/npn/client/NPNClientConnectionFactory.java delete mode 100644 jetty-npn/jetty-npn-server/pom.xml delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/etc/protonego-npn.xml delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_04.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_05.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_06.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_07.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_09.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_10.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_11.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_13.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_15.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_17.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_21.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_25.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_40.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_45.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_51.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_55.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_67.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_71.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_72.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_75.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_76.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod delete mode 100644 jetty-npn/jetty-npn-server/src/main/java/org/eclipse/jetty/npn/server/NPNServerConnection.java delete mode 100644 jetty-npn/jetty-npn-server/src/main/java/org/eclipse/jetty/npn/server/NPNServerConnectionFactory.java delete mode 100644 jetty-npn/jetty-npn-server/src/test/java/org/eclipse/jetty/npn/server/NPNModuleTest.java delete mode 100644 jetty-npn/pom.xml delete mode 100644 jetty-osgi/jetty-osgi-npn/pom.xml delete mode 100644 jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml rename jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/{TestJettyOSGiBootSpdy.java => TestJettyOSGiBootHTTP2.java} (84%) delete mode 100644 jetty-spdy/pom.xml delete mode 100644 jetty-spdy/spdy-alpn-tests/pom.xml delete mode 100644 jetty-spdy/spdy-alpn-tests/src/test/java/org/eclipse/jetty/spdy/server/ALPNNegotiationTest.java delete mode 100644 jetty-spdy/spdy-alpn-tests/src/test/java/org/eclipse/jetty/spdy/server/ALPNSynReplyTest.java delete mode 100644 jetty-spdy/spdy-alpn-tests/src/test/java/org/eclipse/jetty/spdy/server/AbstractALPNTest.java delete mode 100644 jetty-spdy/spdy-alpn-tests/src/test/resources/jetty-logging.properties delete mode 100644 jetty-spdy/spdy-alpn-tests/src/test/resources/keystore.jks delete mode 100644 jetty-spdy/spdy-alpn-tests/src/test/resources/truststore.jks delete mode 100644 jetty-spdy/spdy-client/pom.xml delete mode 100644 jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/FlowControlStrategyFactory.java delete mode 100644 jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java delete mode 100644 jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClientConnectionFactory.java delete mode 100644 jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java delete mode 100644 jetty-spdy/spdy-core/pom.xml delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionDictionary.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionFactory.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Controller.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/FlowControlStrategy.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Flusher.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/ISession.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IStream.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IdleListener.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/PushSynInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/SPDYv3FlowControlStrategy.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/SessionException.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardCompressionFactory.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StreamException.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ByteBufferDataInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/BytesDataInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/GoAwayInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/GoAwayResultInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/HeadersInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Info.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PingInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PingResultInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PushInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ReplyInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/RstInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDY.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDYException.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Session.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionFrameListener.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionStatus.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Settings.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SettingsInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Stream.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamFrameListener.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamStatus.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StringDataInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SynInfo.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/server/ServerSessionFrameListener.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrameType.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/CredentialFrame.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/NoOpFrame.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/ControlFrameGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/CredentialGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/Generator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/GoAwayGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/NoOpGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/PingGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/RstStreamGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SettingsGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynReplyGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynStreamGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/WindowUpdateGenerator.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameBodyParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/CredentialBodyParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/DataFrameParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/GoAwayBodyParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBodyParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/NoOpBodyParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/Parser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/PingBodyParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/RstStreamBodyParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SettingsBodyParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynReplyBodyParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynStreamBodyParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameBodyParser.java delete mode 100644 jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/WindowUpdateBodyParser.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/AsyncTimeoutTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardStreamTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ServerUsageTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/CredentialGenerateParseTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/DataGenerateParseTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/GoAwayGenerateParseTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/HeadersGenerateParseTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/NoOpGenerateParseTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/PingGenerateParseTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/RstStreamGenerateParseTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SettingsGenerateParseTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynReplyGenerateParseTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynStreamGenerateParseTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/TestSPDYParserListener.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/WindowUpdateGenerateParseTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/generator/DataFrameGeneratorTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/BrokenFrameTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/LiveChromiumRequestParserTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/ParseVersusCacheBenchmarkTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameTest.java delete mode 100644 jetty-spdy/spdy-core/src/test/resources/jetty-logging.properties delete mode 100644 jetty-spdy/spdy-core/src/test/resources/keystore.jks delete mode 100644 jetty-spdy/spdy-core/src/test/resources/truststore.jks delete mode 100644 jetty-spdy/spdy-example-webapp/pom.xml delete mode 100644 jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy-proxy.xml delete mode 100644 jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy.xml delete mode 100644 jetty-spdy/spdy-example-webapp/src/main/resources/jetty-logging.properties delete mode 100644 jetty-spdy/spdy-example-webapp/src/main/resources/keystore.jks delete mode 100644 jetty-spdy/spdy-example-webapp/src/main/resources/truststore.jks delete mode 100644 jetty-spdy/spdy-example-webapp/src/main/webapp/WEB-INF/web.xml delete mode 100644 jetty-spdy/spdy-example-webapp/src/main/webapp/form.jsp delete mode 100644 jetty-spdy/spdy-example-webapp/src/main/webapp/included.jsp delete mode 100644 jetty-spdy/spdy-example-webapp/src/main/webapp/index.jsp delete mode 100644 jetty-spdy/spdy-example-webapp/src/main/webapp/logo.jpg delete mode 100644 jetty-spdy/spdy-example-webapp/src/main/webapp/stylesheet.css delete mode 100644 jetty-spdy/spdy-http-client-transport/pom.xml delete mode 100644 jetty-spdy/spdy-http-client-transport/src/main/java/org/eclipse/jetty/spdy/client/http/HttpChannelOverSPDY.java delete mode 100644 jetty-spdy/spdy-http-client-transport/src/main/java/org/eclipse/jetty/spdy/client/http/HttpClientTransportOverSPDY.java delete mode 100644 jetty-spdy/spdy-http-client-transport/src/main/java/org/eclipse/jetty/spdy/client/http/HttpConnectionOverSPDY.java delete mode 100644 jetty-spdy/spdy-http-client-transport/src/main/java/org/eclipse/jetty/spdy/client/http/HttpDestinationOverSPDY.java delete mode 100644 jetty-spdy/spdy-http-client-transport/src/main/java/org/eclipse/jetty/spdy/client/http/HttpReceiverOverSPDY.java delete mode 100644 jetty-spdy/spdy-http-client-transport/src/main/java/org/eclipse/jetty/spdy/client/http/HttpSenderOverSPDY.java delete mode 100644 jetty-spdy/spdy-http-client-transport/src/test/java/org/eclipse/jetty/spdy/client/http/AbstractHttpClientServerTest.java delete mode 100644 jetty-spdy/spdy-http-client-transport/src/test/java/org/eclipse/jetty/spdy/client/http/EmptyServerHandler.java delete mode 100644 jetty-spdy/spdy-http-client-transport/src/test/java/org/eclipse/jetty/spdy/client/http/HttpClientCustomProxyTest.java delete mode 100644 jetty-spdy/spdy-http-client-transport/src/test/java/org/eclipse/jetty/spdy/client/http/HttpClientTest.java delete mode 100644 jetty-spdy/spdy-http-client-transport/src/test/resources/jetty-logging.properties delete mode 100644 jetty-spdy/spdy-http-client-transport/src/test/resources/keystore.jks delete mode 100644 jetty-spdy/spdy-http-client-transport/src/test/resources/truststore.jks delete mode 100644 jetty-spdy/spdy-http-common/pom.xml delete mode 100644 jetty-spdy/spdy-http-common/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYHeader.java delete mode 100644 jetty-spdy/spdy-http-server/pom.xml delete mode 100644 jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy-proxy.xml delete mode 100644 jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy.xml delete mode 100644 jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnector.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpInputOverSPDY.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/PushStrategy.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategy.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/HTTPProxyEngine.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/HTTPSPDYProxyServerConnector.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyEngine.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyEngineSelector.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPConnectionFactory.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java delete mode 100644 jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/AbstractHTTPSPDYTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ConcurrentStreamsTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDYTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/PushStrategyBenchmarkTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyUnitTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/SPDYTestUtils.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/SSLExternalServerTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/SimpleHTTPBenchmarkTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPToSPDYTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPLoadTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYLoadTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYTest.java delete mode 100644 jetty-spdy/spdy-http-server/src/test/resources/big_script.js delete mode 100644 jetty-spdy/spdy-http-server/src/test/resources/jetty-logging.properties delete mode 100644 jetty-spdy/spdy-http-server/src/test/resources/keystore.jks delete mode 100644 jetty-spdy/spdy-http-server/src/test/resources/truststore.jks delete mode 100644 jetty-spdy/spdy-npn-tests/pom.xml delete mode 100644 jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy/server/AbstractNPNTest.java delete mode 100644 jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy/server/NPNNegotiationTest.java delete mode 100644 jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy/server/SSLEngineLeakTest.java delete mode 100644 jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy/server/SSLSynReplyTest.java delete mode 100644 jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy/server/proxy/NPNProxySPDYToHTTPLoadTest.java delete mode 100644 jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy/server/proxy/NPNProxySPDYToHTTPTest.java delete mode 100644 jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy/server/proxy/NPNProxySPDYToSPDYLoadTest.java delete mode 100644 jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy/server/proxy/NPNProxySPDYToSPDYTest.java delete mode 100644 jetty-spdy/spdy-npn-tests/src/test/resources/jetty-logging.properties delete mode 100644 jetty-spdy/spdy-npn-tests/src/test/resources/keystore.jks delete mode 100644 jetty-spdy/spdy-npn-tests/src/test/resources/truststore.jks delete mode 100644 jetty-spdy/spdy-server/pom.xml delete mode 100644 jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/SPDYServerConnectionFactory.java delete mode 100644 jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/SPDYServerConnector.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/AbstractTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/ClosedStreamTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/FlowControlTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/HeadersTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/IdleTimeoutTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/MaxConcurrentStreamTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/PingTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/ProtocolViolationsTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/PushStreamTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/ResetStreamTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SPDYClientFactoryTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SPDYServerConnectorTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SettingsTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SynDataReplyDataLoadTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SynReplyTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/UnsupportedVersionTest.java delete mode 100644 jetty-spdy/spdy-server/src/test/resources/jetty-logging.properties diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml index d9e562a308b..b4302d81241 100644 --- a/aggregates/jetty-all-compact3/pom.xml +++ b/aggregates/jetty-all-compact3/pom.xml @@ -166,20 +166,6 @@ ${project.version} provided - org.eclipse.jetty jetty-plus diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index 89bf73d4210..ed74863742f 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -140,12 +140,6 @@ ${project.version} provided - - org.eclipse.jetty.spdy - spdy-http-server - ${project.version} - provided - org.eclipse.jetty jetty-jmx diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 0aab3c82f9f..6fbb0b7cc12 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -56,8 +56,18 @@ ${project.version} - org.eclipse.jetty.spdy - spdy-http-server + org.eclipse.jetty.http2 + http2-server + ${project.version} + + + org.eclipse.jetty.alpn + alpn-api + ${alpn.api.version} + + + org.eclipse.jetty + jetty-alpn-server ${project.version} diff --git a/jetty-http2/http2-server/src/test/java/org/eclipse/jetty/http2/server/Http2Server.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java similarity index 97% rename from jetty-http2/http2-server/src/test/java/org/eclipse/jetty/http2/server/Http2Server.java rename to examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java index 601e87cc9a6..d83c76f11e9 100644 --- a/jetty-http2/http2-server/src/test/java/org/eclipse/jetty/http2/server/Http2Server.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java @@ -17,7 +17,7 @@ // -package org.eclipse.jetty.http2.server; +package org.eclipse.jetty.embedded; import java.io.IOException; import java.util.Date; @@ -39,6 +39,7 @@ import javax.servlet.http.HttpSession; import org.eclipse.jetty.alpn.ALPN; import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory; +import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.NegotiatingServerConnectionFactory; @@ -64,7 +65,7 @@ public class Http2Server Server server = new Server(); ServletContextHandler context = new ServletContextHandler(server, "/",ServletContextHandler.SESSIONS); - context.setResourceBase("src/test/docroot"); + context.setResourceBase("src/main/resources/docroot"); context.addFilter(PushSessionCacheFilter.class,"/*",EnumSet.of(DispatcherType.REQUEST)); context.addFilter(PushedTilesFilter.class,"/*",EnumSet.of(DispatcherType.REQUEST)); context.addServlet(new ServletHolder(servlet), "/test/*"); diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyConnector.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyConnector.java deleted file mode 100644 index f35957b9780..00000000000 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyConnector.java +++ /dev/null @@ -1,114 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.embedded; - -import org.eclipse.jetty.npn.server.NPNServerConnectionFactory; -import java.io.File; -import java.io.FileNotFoundException; - -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.NegotiatingServerConnectionFactory; -import org.eclipse.jetty.server.SecureRequestCustomizer; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory; -import org.eclipse.jetty.spdy.server.http.ReferrerPushStrategy; -import org.eclipse.jetty.util.ssl.SslContextFactory; - -/** - * A Jetty server with HTTP and SPDY connectors. - */ -public class SpdyConnector -{ - public static void main(String[] args) throws Exception - { - // Path to as-built jetty-distribution directory - String jettyHomeBuild = "../../jetty-distribution/target/distribution"; - - // Find jetty home directories - String homePath = System.getProperty("jetty.home", jettyHomeBuild); - File homeDir = new File(homePath); - if (!homeDir.exists()) - { - throw new FileNotFoundException(homeDir.getAbsolutePath()); - } - String jetty_home = homeDir.getAbsolutePath(); - System.setProperty("jetty.home", jetty_home); - - // The Server - Server server = new Server(); - - // HTTP Configuration - HttpConfiguration http_config = new HttpConfiguration(); - http_config.setSecureScheme("https"); - http_config.setSecurePort(8443); - - // HTTP connector - ServerConnector http = new ServerConnector(server, - new HttpConnectionFactory(http_config)); - http.setPort(8080); - server.addConnector(http); - - // SSL Context Factory for HTTPS and SPDY - SslContextFactory sslContextFactory = new SslContextFactory(); - sslContextFactory.setKeyStorePath(jetty_home + "/etc/keystore"); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); - - // HTTPS Configuration - HttpConfiguration https_config = new HttpConfiguration(http_config); - https_config.addCustomizer(new SecureRequestCustomizer()); - - // SPDY versions - HTTPSPDYServerConnectionFactory spdy2 = - new HTTPSPDYServerConnectionFactory(2, https_config); - - HTTPSPDYServerConnectionFactory spdy3 = - new HTTPSPDYServerConnectionFactory(3, https_config, - new ReferrerPushStrategy()); - - // NPN Factory - NegotiatingServerConnectionFactory.checkProtocolNegotiationAvailable(); - NPNServerConnectionFactory npn = new NPNServerConnectionFactory( - spdy3.getProtocol(), - spdy2.getProtocol(), - http.getDefaultProtocol()); - npn.setDefaultProtocol(http.getDefaultProtocol()); - - // SSL Factory - SslConnectionFactory ssl = new SslConnectionFactory( - sslContextFactory, npn.getProtocol()); - - // SPDY Connector - ServerConnector spdyConnector = new ServerConnector(server, ssl, - npn, spdy3, spdy2, - new HttpConnectionFactory(https_config)); - spdyConnector.setPort(8443); - server.addConnector(spdyConnector); - - // Set a handler - server.setHandler(new HelloHandler()); - - // Start the server - server.start(); - server.join(); - } -} diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java deleted file mode 100644 index 60f2f8d461a..00000000000 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java +++ /dev/null @@ -1,210 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.embedded; - -import java.io.File; -import java.io.FileNotFoundException; -import java.lang.management.ManagementFactory; - -import org.eclipse.jetty.deploy.DeploymentManager; -import org.eclipse.jetty.deploy.providers.WebAppProvider; -import org.eclipse.jetty.jmx.MBeanContainer; -import org.eclipse.jetty.npn.server.NPNServerConnectionFactory; -import org.eclipse.jetty.security.HashLoginService; -import org.eclipse.jetty.server.AsyncNCSARequestLog; -import org.eclipse.jetty.server.ForwardedRequestCustomizer; -import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.NCSARequestLog; -import org.eclipse.jetty.server.NegotiatingServerConnectionFactory; -import org.eclipse.jetty.server.SecureRequestCustomizer; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.server.handler.DefaultHandler; -import org.eclipse.jetty.server.handler.HandlerCollection; -import org.eclipse.jetty.server.handler.RequestLogHandler; -import org.eclipse.jetty.server.handler.StatisticsHandler; -import org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory; -import org.eclipse.jetty.spdy.server.http.PushStrategy; -import org.eclipse.jetty.spdy.server.http.ReferrerPushStrategy; -import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.eclipse.jetty.util.thread.QueuedThreadPool; - -public class SpdyServer -{ - public static void main( String[] args ) throws Exception - { - // Path to as-built jetty-distribution directory - String jettyHomeBuild = "../../jetty-distribution/target/distribution"; - - // Find jetty home directories - String homePath = System.getProperty("jetty.home", jettyHomeBuild); - File homeDir = new File(homePath); - if (!homeDir.exists()) - { - throw new FileNotFoundException(homeDir.getAbsolutePath()); - } - String jetty_home = homeDir.getAbsolutePath(); - System.setProperty("jetty.home", jetty_home); - - // Setup Threadpool - QueuedThreadPool threadPool = new QueuedThreadPool(512); - - // Setup Jetty Server instance - Server server = new Server(threadPool); - server.manage(threadPool); - server.setDumpAfterStart(false); - server.setDumpBeforeStop(false); - - // Setup JMX - MBeanContainer mbContainer = new MBeanContainer( - ManagementFactory.getPlatformMBeanServer()); - server.addBean(mbContainer); - - // Common HTTP configuration - HttpConfiguration config = new HttpConfiguration(); - config.setSecurePort(8443); - config.addCustomizer(new ForwardedRequestCustomizer()); - config.addCustomizer(new SecureRequestCustomizer()); - config.setSendServerVersion(true); - - // Http Connector Setup - - // A plain HTTP connector listening on port 8080. Note that it's also - // possible to have port 8080 configured as a non SSL SPDY connector. - // But the specification and most browsers do not allow to use SPDY - // without SSL encryption. However some browsers allow it to be - // configured. - HttpConnectionFactory http = new HttpConnectionFactory(config); - ServerConnector httpConnector = new ServerConnector(server, http); - httpConnector.setPort(8080); - httpConnector.setIdleTimeout(10000); - server.addConnector(httpConnector); - - // SSL configurations - - // We need a SSLContextFactory for the SSL encryption. That - // SSLContextFactory will be used by the SPDY - // connector. - SslContextFactory sslContextFactory = new SslContextFactory(); - sslContextFactory.setKeyStorePath(jetty_home + "/etc/keystore"); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); - sslContextFactory.setTrustStorePath(jetty_home + "/etc/keystore"); - sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setExcludeCipherSuites( - "SSL_RSA_WITH_DES_CBC_SHA", - "SSL_DHE_RSA_WITH_DES_CBC_SHA", - "SSL_DHE_DSS_WITH_DES_CBC_SHA", - "SSL_RSA_EXPORT_WITH_RC4_40_MD5", - "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA", - "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA", - "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"); - - // Spdy Connector - - // Make sure that the required NPN implementations are available. - NegotiatingServerConnectionFactory.checkProtocolNegotiationAvailable(); - - // A ReferrerPushStrategy is being initialized. - // See: - // http://www.eclipse.org/jetty/documentation/current/spdy-configuring-push.html - // for more details. - PushStrategy push = new ReferrerPushStrategy(); - HTTPSPDYServerConnectionFactory spdy2 = - new HTTPSPDYServerConnectionFactory(2, config, push); - spdy2.setInputBufferSize(8192); - spdy2.setInitialWindowSize(32768); - - // We need a connection factory per protocol that our server is supposed - // to support on the NPN port. We then - // create a ServerConnector and pass in the supported factories. NPN - // will then be used to negotiate the - // protocol with the client. - HTTPSPDYServerConnectionFactory spdy3 = - new HTTPSPDYServerConnectionFactory(3, config, push); - spdy3.setInputBufferSize(8192); - - NPNServerConnectionFactory npn = new NPNServerConnectionFactory( - spdy3.getProtocol(), spdy2.getProtocol(), http.getProtocol()); - npn.setDefaultProtocol(http.getProtocol()); - npn.setInputBufferSize(1024); - - SslConnectionFactory ssl = new SslConnectionFactory(sslContextFactory, - npn.getProtocol()); - - // Setup the npn connector on port 8443 - ServerConnector spdyConnector = new ServerConnector(server, ssl, - npn, spdy3, spdy2, http); - spdyConnector.setPort(8443); - - server.addConnector(spdyConnector); - - // The following section adds some handlers, deployers and webapp - // providers. See - // http://www.eclipse.org/jetty/documentation/current/advanced-embedding.html - // for details. - - // Setup handlers - HandlerCollection handlers = new HandlerCollection(); - ContextHandlerCollection contexts = new ContextHandlerCollection(); - RequestLogHandler requestLogHandler = new RequestLogHandler(); - - handlers.setHandlers(new Handler[] { contexts, new DefaultHandler(), - requestLogHandler }); - - StatisticsHandler stats = new StatisticsHandler(); - stats.setHandler(handlers); - - server.setHandler(stats); - - // Setup deployers - DeploymentManager deployer = new DeploymentManager(); - deployer.setContexts(contexts); - server.addBean(deployer); - - WebAppProvider webapp_provider = new WebAppProvider(); - webapp_provider.setMonitoredDirName(jetty_home + "/webapps"); - webapp_provider.setParentLoaderPriority(false); - webapp_provider.setExtractWars(true); - webapp_provider.setScanInterval(2); - webapp_provider.setDefaultsDescriptor(jetty_home - + "/etc/webdefault.xml"); - deployer.addAppProvider(webapp_provider); - - HashLoginService login = new HashLoginService(); - login.setName("Test Realm"); - login.setConfig(jetty_home + "/etc/realm.properties"); - server.addBean(login); - - NCSARequestLog requestLog = new AsyncNCSARequestLog(); - requestLog.setFilename(jetty_home + "/logs/jetty-yyyy_mm_dd.log"); - requestLog.setExtended(false); - requestLogHandler.setRequestLog(requestLog); - - server.setStopAtShutdown(true); - - server.start(); - server.dumpStdErr(); - server.join(); - } -} diff --git a/jetty-http2/http2-server/src/test/docroot/push.html b/examples/embedded/src/main/resources/docroot/push.html similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/push.html rename to examples/embedded/src/main/resources/docroot/push.html diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile00.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile00.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile00.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile00.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile01.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile01.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile01.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile01.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile02.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile02.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile02.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile02.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile03.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile03.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile03.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile03.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile04.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile04.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile04.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile04.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile05.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile05.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile05.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile05.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile06.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile06.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile06.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile06.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile07.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile07.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile07.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile07.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile08.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile08.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile08.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile08.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile09.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile09.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile09.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile09.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile10.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile10.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile10.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile10.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile11.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile11.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile11.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile11.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile12.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile12.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile12.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile12.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile13.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile13.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile13.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile13.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile14.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile14.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile14.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile14.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile15.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile15.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile15.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile15.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile16.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile16.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile16.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile16.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile17.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile17.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile17.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile17.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile18.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile18.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile18.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile18.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile19.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile19.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile19.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile19.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile20.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile20.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile20.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile20.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile21.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile21.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile21.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile21.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile22.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile22.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile22.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile22.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile23.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile23.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile23.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile23.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile24.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile24.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile24.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile24.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile25.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile25.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile25.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile25.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile26.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile26.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile26.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile26.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile27.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile27.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile27.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile27.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile28.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile28.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile28.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile28.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile29.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile29.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile29.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile29.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile30.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile30.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile30.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile30.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile31.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile31.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile31.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile31.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile32.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile32.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile32.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile32.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile33.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile33.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile33.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile33.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile34.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile34.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile34.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile34.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile35.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile35.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile35.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile35.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile36.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile36.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile36.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile36.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile37.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile37.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile37.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile37.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile38.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile38.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile38.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile38.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile39.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile39.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile39.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile39.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile40.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile40.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile40.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile40.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile41.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile41.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile41.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile41.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile42.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile42.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile42.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile42.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile43.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile43.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile43.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile43.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile44.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile44.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile44.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile44.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile45.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile45.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile45.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile45.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile46.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile46.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile46.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile46.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile47.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile47.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile47.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile47.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile48.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile48.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile48.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile48.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/pushed/tile49.jpg b/examples/embedded/src/main/resources/docroot/pushed/tile49.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/pushed/tile49.jpg rename to examples/embedded/src/main/resources/docroot/pushed/tile49.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile00.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile00.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile00.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile00.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile01.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile01.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile01.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile01.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile02.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile02.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile02.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile02.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile03.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile03.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile03.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile03.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile04.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile04.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile04.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile04.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile05.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile05.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile05.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile05.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile06.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile06.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile06.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile06.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile07.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile07.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile07.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile07.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile08.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile08.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile08.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile08.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile09.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile09.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile09.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile09.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile10.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile10.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile10.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile10.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile11.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile11.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile11.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile11.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile12.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile12.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile12.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile12.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile13.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile13.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile13.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile13.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile14.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile14.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile14.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile14.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile15.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile15.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile15.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile15.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile16.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile16.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile16.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile16.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile17.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile17.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile17.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile17.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile18.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile18.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile18.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile18.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile19.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile19.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile19.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile19.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile20.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile20.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile20.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile20.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile21.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile21.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile21.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile21.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile22.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile22.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile22.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile22.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile23.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile23.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile23.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile23.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile24.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile24.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile24.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile24.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile25.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile25.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile25.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile25.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile26.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile26.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile26.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile26.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile27.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile27.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile27.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile27.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile28.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile28.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile28.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile28.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile29.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile29.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile29.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile29.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile30.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile30.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile30.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile30.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile31.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile31.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile31.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile31.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile32.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile32.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile32.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile32.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile33.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile33.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile33.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile33.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile34.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile34.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile34.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile34.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile35.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile35.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile35.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile35.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile36.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile36.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile36.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile36.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile37.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile37.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile37.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile37.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile38.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile38.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile38.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile38.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile39.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile39.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile39.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile39.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile40.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile40.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile40.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile40.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile41.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile41.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile41.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile41.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile42.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile42.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile42.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile42.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile43.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile43.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile43.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile43.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile44.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile44.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile44.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile44.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile45.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile45.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile45.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile45.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile46.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile46.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile46.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile46.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile47.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile47.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile47.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile47.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile48.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile48.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile48.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile48.jpg diff --git a/jetty-http2/http2-server/src/test/docroot/tiles/tile49.jpg b/examples/embedded/src/main/resources/docroot/tiles/tile49.jpg similarity index 100% rename from jetty-http2/http2-server/src/test/docroot/tiles/tile49.jpg rename to examples/embedded/src/main/resources/docroot/tiles/tile49.jpg diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index ea9b556fa4e..64205ba7adf 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -25,7 +25,7 @@ org.eclipse.jetty - org.eclipse.jetty.orbit,org.eclipse.jetty.spdy,org.eclipse.jetty.websocket,org.eclipse.jetty.drafts + org.eclipse.jetty.orbit,org.eclipse.jetty.websocket,org.eclipse.jetty.drafts jetty-all,jetty-start,jetty-monitor,jetty-jsp jar ${project.build.directory}/test-lib diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 7f61e42b59b..d8fc9d3c376 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -301,7 +301,7 @@ org.eclipse.jetty - org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.spdy,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs + org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs jetty-all,jetty-jsp,apache-jsp,apache-jstl,jetty-start,jetty-monitor,jetty-spring jar ${assembly-directory}/lib @@ -404,32 +404,6 @@ - - unpack-spdy - process-resources - - unpack-dependencies - - - org.eclipse.jetty.spdy - config - false - META-INF/** - ${assembly-directory} - - - - copy-lib-spdy-deps - process-resources - - copy-dependencies - - - org.eclipse.jetty.spdy - jar - ${assembly-directory}/lib/spdy - - copy-annotations-deps generate-resources @@ -841,37 +815,11 @@ http2-server ${project.version} - - org.eclipse.jetty.spdy - spdy-core - ${project.version} - - - org.eclipse.jetty.spdy - spdy-server - ${project.version} - - - org.eclipse.jetty.spdy - spdy-http-server - ${project.version} - - - org.eclipse.jetty.spdy - spdy-example-webapp - ${project.version} - war - org.eclipse.jetty jetty-alpn-server ${project.version} - - org.eclipse.jetty - jetty-npn-server - ${project.version} - org.eclipse.jetty.example-async-rest example-async-rest-webapp diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 91c096b59f8..760556448fb 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -1,57 +1,68 @@ - - - org.eclipse.jetty.fcgi - fcgi-parent - 9.3.0-SNAPSHOT - + + + org.eclipse.jetty.fcgi + fcgi-parent + 9.3.0-SNAPSHOT + - 4.0.0 - fcgi-server - Jetty :: FastCGI :: Server + 4.0.0 + fcgi-server + Jetty :: FastCGI :: Server - - ${project.groupId}.server - + + ${project.groupId}.server + - - - - - - - - javax.servlet - javax.servlet-api - - - org.eclipse.jetty.fcgi - fcgi-client - ${project.version} - - - org.eclipse.jetty - jetty-proxy - ${project.version} - - - org.eclipse.jetty - jetty-server - ${project.version} - - - - org.eclipse.jetty - jetty-servlet - ${project.version} - test - - - org.eclipse.jetty.spdy - spdy-http-server - ${project.version} - test - - + + + + + + + javax.servlet + javax.servlet-api + + + org.eclipse.jetty.fcgi + fcgi-client + ${project.version} + + + org.eclipse.jetty + jetty-proxy + ${project.version} + + + org.eclipse.jetty + jetty-server + ${project.version} + + + org.eclipse.jetty + jetty-servlet + ${project.version} + test + + + org.eclipse.jetty.http2 + http2-server + ${project.version} + test + + + org.eclipse.jetty + jetty-alpn-server + ${project.version} + test + + + org.eclipse.jetty + jetty-annotations + ${project.version} + test + + diff --git a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/DrupalSPDYFastCGIProxyServer.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/DrupalSPDYFastCGIProxyServer.java index 948997d4432..5043ab5c2f5 100644 --- a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/DrupalSPDYFastCGIProxyServer.java +++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/DrupalSPDYFastCGIProxyServer.java @@ -21,14 +21,19 @@ package org.eclipse.jetty.fcgi.server.proxy; import java.util.HashMap; import java.util.Map; +import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory; +import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; +import org.eclipse.jetty.server.ForwardedRequestCustomizer; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.NegotiatingServerConnectionFactory; +import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.spdy.api.SPDY; -import org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnector; -import org.eclipse.jetty.spdy.server.http.PushStrategy; -import org.eclipse.jetty.spdy.server.http.ReferrerPushStrategy; import org.eclipse.jetty.util.ssl.SslContextFactory; public class DrupalSPDYFastCGIProxyServer @@ -44,11 +49,26 @@ public class DrupalSPDYFastCGIProxyServer Server server = new Server(); - Map pushStrategies = new HashMap<>(); - pushStrategies.put(SPDY.V3, new ReferrerPushStrategy()); - HTTPSPDYServerConnector connector = new HTTPSPDYServerConnector(server, sslContextFactory, pushStrategies); - connector.setPort(8443); - server.addConnector(connector); + // HTTP(S) Configuration + HttpConfiguration config = new HttpConfiguration(); + HttpConfiguration https_config = new HttpConfiguration(config); + https_config.addCustomizer(new SecureRequestCustomizer()); + + // HTTP2 factory + HTTP2ServerConnectionFactory h2 = new HTTP2ServerConnectionFactory(https_config); + NegotiatingServerConnectionFactory.checkProtocolNegotiationAvailable(); + ALPNServerConnectionFactory alpn = new ALPNServerConnectionFactory(); + alpn.setDefaultProtocol(h2.getProtocol()); + + // SSL Factory + SslConnectionFactory ssl = new SslConnectionFactory(sslContextFactory,alpn.getProtocol()); + + // HTTP2 Connector + ServerConnector http2Connector = + new ServerConnector(server,ssl,alpn,h2,new HttpConnectionFactory(https_config)); + http2Connector.setPort(8443); + http2Connector.setIdleTimeout(15000); + server.addConnector(http2Connector); // Drupal seems to only work on the root context, // at least out of the box without additional plugins diff --git a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/WordPressSPDYFastCGIProxyServer.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/WordPressSPDYFastCGIProxyServer.java index 39ff74567bf..9020572e1a9 100644 --- a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/WordPressSPDYFastCGIProxyServer.java +++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/WordPressSPDYFastCGIProxyServer.java @@ -19,20 +19,22 @@ package org.eclipse.jetty.fcgi.server.proxy; import java.util.EnumSet; -import java.util.HashMap; -import java.util.Map; import javax.servlet.DispatcherType; +import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory; +import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.NegotiatingServerConnectionFactory; +import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.spdy.api.SPDY; -import org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnector; -import org.eclipse.jetty.spdy.server.http.PushStrategy; -import org.eclipse.jetty.spdy.server.http.ReferrerPushStrategy; import org.eclipse.jetty.util.ssl.SslContextFactory; public class WordPressSPDYFastCGIProxyServer @@ -51,14 +53,26 @@ public class WordPressSPDYFastCGIProxyServer Server server = new Server(); - Map pushStrategies = new HashMap<>(); - pushStrategies.put(SPDY.V3, new ReferrerPushStrategy()); - HTTPSPDYServerConnector tlsConnector = new HTTPSPDYServerConnector(server, sslContextFactory, pushStrategies); - tlsConnector.setPort(tlsPort); - server.addConnector(tlsConnector); - HTTPSPDYServerConnector connector = new HTTPSPDYServerConnector(server, null, pushStrategies); - connector.setPort(port); - server.addConnector(connector); + // HTTP(S) Configuration + HttpConfiguration config = new HttpConfiguration(); + HttpConfiguration https_config = new HttpConfiguration(config); + https_config.addCustomizer(new SecureRequestCustomizer()); + + // HTTP2 factory + HTTP2ServerConnectionFactory h2 = new HTTP2ServerConnectionFactory(https_config); + NegotiatingServerConnectionFactory.checkProtocolNegotiationAvailable(); + ALPNServerConnectionFactory alpn = new ALPNServerConnectionFactory(); + alpn.setDefaultProtocol(h2.getProtocol()); + + // SSL Factory + SslConnectionFactory ssl = new SslConnectionFactory(sslContextFactory,alpn.getProtocol()); + + // HTTP2 Connector + ServerConnector http2Connector = + new ServerConnector(server,ssl,alpn,h2,new HttpConnectionFactory(https_config)); + http2Connector.setPort(tlsPort); + http2Connector.setIdleTimeout(15000); + server.addConnector(http2Connector); String root = "/home/simon/programs/wordpress-3.7.1"; diff --git a/jetty-npn/jetty-npn-client/pom.xml b/jetty-npn/jetty-npn-client/pom.xml deleted file mode 100644 index 1a7b8d67e48..00000000000 --- a/jetty-npn/jetty-npn-client/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - org.eclipse.jetty - jetty-npn-parent - 9.3.0-SNAPSHOT - - 4.0.0 - jetty-npn-client - Jetty :: NPN :: Client - - ${project.groupId}.npn.client - - - - - org.apache.felix - maven-bundle-plugin - true - - - - manifest - - - - org.eclipse.jetty.npn;resolution:=optional - - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.npn.* - - - - - - - org.eclipse.jetty - jetty-io - ${project.version} - - - org.eclipse.jetty.npn - npn-api - ${npn.api.version} - provided - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - diff --git a/jetty-npn/jetty-npn-client/src/main/java/org/eclipse/jetty/npn/client/NPNClientConnection.java b/jetty-npn/jetty-npn-client/src/main/java/org/eclipse/jetty/npn/client/NPNClientConnection.java deleted file mode 100644 index 776ed279e97..00000000000 --- a/jetty-npn/jetty-npn-client/src/main/java/org/eclipse/jetty/npn/client/NPNClientConnection.java +++ /dev/null @@ -1,82 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.npn.client; - -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executor; -import javax.net.ssl.SSLEngine; - -import org.eclipse.jetty.io.ClientConnectionFactory; -import org.eclipse.jetty.io.EndPoint; -import org.eclipse.jetty.io.NegotiatingClientConnection; -import org.eclipse.jetty.npn.NextProtoNego; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; - -public class NPNClientConnection extends NegotiatingClientConnection implements NextProtoNego.ClientProvider -{ - private static final Logger LOG = Log.getLogger(NPNClientConnection.class); - - private final String protocol; - - public NPNClientConnection(EndPoint endPoint, Executor executor, ClientConnectionFactory connectionFactory, SSLEngine sslEngine, Map context, String protocol) - { - super(endPoint, executor, sslEngine, connectionFactory, context); - this.protocol = protocol; - NextProtoNego.put(sslEngine, this); - } - - @Override - public boolean supports() - { - return true; - } - - @Override - public void unsupported() - { - NextProtoNego.remove(getSSLEngine()); - completed(); - } - - @Override - public String selectProtocol(List protocols) - { - if (protocols.contains(protocol)) - { - NextProtoNego.remove(getSSLEngine()); - completed(); - return protocol; - } - else - { - LOG.info("Could not negotiate protocol: server {} - client {}", protocols, protocol); - close(); - return null; - } - } - - @Override - public void close() - { - NextProtoNego.remove(getSSLEngine()); - super.close(); - } -} diff --git a/jetty-npn/jetty-npn-client/src/main/java/org/eclipse/jetty/npn/client/NPNClientConnectionFactory.java b/jetty-npn/jetty-npn-client/src/main/java/org/eclipse/jetty/npn/client/NPNClientConnectionFactory.java deleted file mode 100644 index 95003479d17..00000000000 --- a/jetty-npn/jetty-npn-client/src/main/java/org/eclipse/jetty/npn/client/NPNClientConnectionFactory.java +++ /dev/null @@ -1,50 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.npn.client; - -import java.io.IOException; -import java.util.Map; -import java.util.concurrent.Executor; -import javax.net.ssl.SSLEngine; - -import org.eclipse.jetty.io.ClientConnectionFactory; -import org.eclipse.jetty.io.Connection; -import org.eclipse.jetty.io.EndPoint; -import org.eclipse.jetty.io.NegotiatingClientConnectionFactory; -import org.eclipse.jetty.io.ssl.SslClientConnectionFactory; - -public class NPNClientConnectionFactory extends NegotiatingClientConnectionFactory -{ - private final Executor executor; - private final String protocol; - - public NPNClientConnectionFactory(Executor executor, ClientConnectionFactory connectionFactory, String protocol) - { - super(connectionFactory); - this.executor = executor; - this.protocol = protocol; - } - - @Override - public Connection newConnection(EndPoint endPoint, Map context) throws IOException - { - return new NPNClientConnection(endPoint, executor, getClientConnectionFactory(), - (SSLEngine)context.get(SslClientConnectionFactory.SSL_ENGINE_CONTEXT_KEY), context, protocol); - } -} diff --git a/jetty-npn/jetty-npn-server/pom.xml b/jetty-npn/jetty-npn-server/pom.xml deleted file mode 100644 index 7f0590f14a6..00000000000 --- a/jetty-npn/jetty-npn-server/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - org.eclipse.jetty - jetty-npn-parent - 9.3.0-SNAPSHOT - - 4.0.0 - jetty-npn-server - Jetty :: NPN :: Server - - ${project.groupId}.npn.server - - - - - - org.apache.maven.plugins - maven-source-plugin - - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.npn.* - - - - - - - org.eclipse.jetty - jetty-server - ${project.version} - - - org.eclipse.jetty.npn - npn-api - ${npn.api.version} - provided - - - org.eclipse.jetty - jetty-start - ${project.version} - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - diff --git a/jetty-npn/jetty-npn-server/src/main/config/etc/protonego-npn.xml b/jetty-npn/jetty-npn-server/src/main/config/etc/protonego-npn.xml deleted file mode 100644 index ef887d10e30..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/etc/protonego-npn.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_04.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_04.mod deleted file mode 100644 index 33818620f70..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_04.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.0.v20120525|lib/npn/npn-boot-1.1.0.v20120525.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.0.v20120525.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_05.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_05.mod deleted file mode 100644 index 33818620f70..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_05.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.0.v20120525|lib/npn/npn-boot-1.1.0.v20120525.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.0.v20120525.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_06.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_06.mod deleted file mode 100644 index 85ee092666f..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_06.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.1.v20121030|lib/npn/npn-boot-1.1.1.v20121030.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.1.v20121030.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_07.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_07.mod deleted file mode 100644 index 85ee092666f..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_07.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.1.v20121030|lib/npn/npn-boot-1.1.1.v20121030.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.1.v20121030.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_09.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_09.mod deleted file mode 100644 index 8d26767f2ef..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_09.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.3.v20130313|lib/npn/npn-boot-1.1.3.v20130313.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.3.v20130313.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_10.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_10.mod deleted file mode 100644 index 8d26767f2ef..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_10.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.3.v20130313|lib/npn/npn-boot-1.1.3.v20130313.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.3.v20130313.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_11.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_11.mod deleted file mode 100644 index 8d26767f2ef..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_11.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.3.v20130313|lib/npn/npn-boot-1.1.3.v20130313.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.3.v20130313.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_13.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_13.mod deleted file mode 100644 index 087b1b162fd..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_13.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.4.v20130313|lib/npn/npn-boot-1.1.4.v20130313.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.4.v20130313.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_15.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_15.mod deleted file mode 100644 index 9dd5dee3f0b..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_15.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.5.v20130313|lib/npn/npn-boot-1.1.5.v20130313.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_17.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_17.mod deleted file mode 100644 index 9dd5dee3f0b..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_17.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.5.v20130313|lib/npn/npn-boot-1.1.5.v20130313.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_21.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_21.mod deleted file mode 100644 index 9dd5dee3f0b..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_21.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.5.v20130313|lib/npn/npn-boot-1.1.5.v20130313.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_25.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_25.mod deleted file mode 100644 index 9dd5dee3f0b..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_25.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.5.v20130313|lib/npn/npn-boot-1.1.5.v20130313.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_40.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_40.mod deleted file mode 100644 index d4ac51c2876..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_40.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.6.v20130911|lib/npn/npn-boot-1.1.6.v20130911.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.6.v20130911.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_45.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_45.mod deleted file mode 100644 index d4ac51c2876..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_45.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.6.v20130911|lib/npn/npn-boot-1.1.6.v20130911.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.6.v20130911.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_51.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_51.mod deleted file mode 100644 index d4ac51c2876..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_51.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.6.v20130911|lib/npn/npn-boot-1.1.6.v20130911.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.6.v20130911.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_55.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_55.mod deleted file mode 100644 index 5864904e15c..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_55.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.8.v20141013|lib/npn/npn-boot-1.1.8.v20141013.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod deleted file mode 100644 index 5864904e15c..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.8.v20141013|lib/npn/npn-boot-1.1.8.v20141013.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod deleted file mode 100644 index 5864904e15c..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.8.v20141013|lib/npn/npn-boot-1.1.8.v20141013.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_67.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_67.mod deleted file mode 100644 index 5864904e15c..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_67.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.8.v20141013|lib/npn/npn-boot-1.1.8.v20141013.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_71.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_71.mod deleted file mode 100644 index b22aa5aaf82..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_71.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.9.v20141016|lib/npn/npn-boot-1.1.9.v20141016.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.9.v20141016.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_72.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_72.mod deleted file mode 100644 index b22aa5aaf82..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_72.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.9.v20141016|lib/npn/npn-boot-1.1.9.v20141016.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.9.v20141016.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_75.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_75.mod deleted file mode 100644 index c709dde7ee2..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_75.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.10.v20150130|lib/npn/npn-boot-1.1.10.v20150130.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.10.v20150130.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_76.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_76.mod deleted file mode 100644 index c709dde7ee2..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_76.mod +++ /dev/null @@ -1,8 +0,0 @@ -[name] -protonego-boot - -[files] -maven://org.mortbay.jetty.npn/npn-boot/1.1.10.v20150130|lib/npn/npn-boot-1.1.10.v20150130.jar - -[exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.10.v20150130.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod deleted file mode 100644 index 45d99ab0317..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod +++ /dev/null @@ -1,38 +0,0 @@ -# NPN is provided via a -Xbootclasspath that modifies the secure connections -# in java to support the NPN layer needed for SPDY. -# -# This modification has a tight dependency on specific updates of Java 1.7. -# (No support for Java 8 exists for npn / npn-boot, use alpn instead) -# -# The npn module will use an appropriate npn-boot jar for your specific -# version of Java. -# -# IMPORTANT: Versions of Java that exist after this module was created are -# not guaranteed to work with existing npn-boot jars, and might -# need a new npn-boot to be created / tested / deployed by the -# Jetty project in order to provide support for these future -# Java versions. -# -# All versions of npn-boot can be found at -# http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/ - - -[name] -protonego-impl - -[depend] -protonego-impl/npn-${java.version} - -[lib] -lib/jetty-npn-client-${jetty.version}.jar -lib/jetty-npn-server-${jetty.version}.jar - -[files] -lib/ -lib/npn/ - -[license] -NPN is a hosted at github under the GPL v2 with ClassPath Exception. -NPN replaces/modifies OpenJDK classes in the java.sun.security.ssl package. -http://github.com/jetty-project/jetty-npn -http://openjdk.java.net/legal/gplv2+ce.html diff --git a/jetty-npn/jetty-npn-server/src/main/java/org/eclipse/jetty/npn/server/NPNServerConnection.java b/jetty-npn/jetty-npn-server/src/main/java/org/eclipse/jetty/npn/server/NPNServerConnection.java deleted file mode 100644 index ce0ab4e42bb..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/java/org/eclipse/jetty/npn/server/NPNServerConnection.java +++ /dev/null @@ -1,68 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.npn.server; - -import java.util.List; -import javax.net.ssl.SSLEngine; - -import org.eclipse.jetty.io.EndPoint; -import org.eclipse.jetty.npn.NextProtoNego; -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.NegotiatingServerConnection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; - -public class NPNServerConnection extends NegotiatingServerConnection implements NextProtoNego.ServerProvider -{ - private static final Logger LOG = Log.getLogger(NPNServerConnection.class); - - public NPNServerConnection(EndPoint endPoint, SSLEngine engine, Connector connector, List protocols, String defaultProtocol) - { - super(connector, endPoint, engine, protocols, defaultProtocol); - NextProtoNego.put(engine, this); - } - - @Override - public void unsupported() - { - protocolSelected(getDefaultProtocol()); - } - - @Override - public List protocols() - { - return getProtocols(); - } - - @Override - public void protocolSelected(String protocol) - { - if (LOG.isDebugEnabled()) - LOG.debug("{} protocol selected {}", this, protocol); - setProtocol(protocol != null ? protocol : getDefaultProtocol()); - NextProtoNego.remove(getSSLEngine()); - } - - @Override - public void close() - { - NextProtoNego.remove(getSSLEngine()); - super.close(); - } -} diff --git a/jetty-npn/jetty-npn-server/src/main/java/org/eclipse/jetty/npn/server/NPNServerConnectionFactory.java b/jetty-npn/jetty-npn-server/src/main/java/org/eclipse/jetty/npn/server/NPNServerConnectionFactory.java deleted file mode 100644 index 6c66332a054..00000000000 --- a/jetty-npn/jetty-npn-server/src/main/java/org/eclipse/jetty/npn/server/NPNServerConnectionFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.npn.server; - -import java.util.List; -import javax.net.ssl.SSLEngine; - -import org.eclipse.jetty.io.AbstractConnection; -import org.eclipse.jetty.io.EndPoint; -import org.eclipse.jetty.npn.NextProtoNego; -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.NegotiatingServerConnectionFactory; -import org.eclipse.jetty.util.annotation.Name; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; - -public class NPNServerConnectionFactory extends NegotiatingServerConnectionFactory -{ - private static final Logger LOG = Log.getLogger(NPNServerConnectionFactory.class); - - public NPNServerConnectionFactory(String protocols) - { - this(protocols.trim().split(",", 0)); - } - - public NPNServerConnectionFactory(@Name("protocols") String... protocols) - { - super("npn", protocols); - try - { - ClassLoader npnClassLoader = NextProtoNego.class.getClassLoader(); - if (npnClassLoader != null) - { - LOG.warn("NPN must be in the boot classloader, not in: " + npnClassLoader); - throw new IllegalStateException("NPN must be in the boot classloader"); - } - } - catch (Throwable x) - { - LOG.warn("NPN not available: " + x); - throw new IllegalStateException("NPN not available", x); - } - } - - @Override - protected AbstractConnection newServerConnection(Connector connector, EndPoint endPoint, SSLEngine engine, List protocols, String defaultProtocol) - { - return new NPNServerConnection(endPoint, engine, connector, protocols, defaultProtocol); - } -} diff --git a/jetty-npn/jetty-npn-server/src/test/java/org/eclipse/jetty/npn/server/NPNModuleTest.java b/jetty-npn/jetty-npn-server/src/test/java/org/eclipse/jetty/npn/server/NPNModuleTest.java deleted file mode 100644 index 511553df5a6..00000000000 --- a/jetty-npn/jetty-npn-server/src/test/java/org/eclipse/jetty/npn/server/NPNModuleTest.java +++ /dev/null @@ -1,121 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.npn.server; - -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Pattern; - -import org.eclipse.jetty.start.BaseHome; -import org.eclipse.jetty.start.FileArg; -import org.eclipse.jetty.start.Module; -import org.eclipse.jetty.toolchain.test.FS; -import org.eclipse.jetty.toolchain.test.MavenTestingUtils; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameter; -import org.junit.runners.Parameterized.Parameters; - -@RunWith(Parameterized.class) -public class NPNModuleTest -{ - @Parameters(name = "{index}: mod:{0}") - public static List data() - { - File npnBootModDir = MavenTestingUtils.getProjectDir("src/main/config/modules/protonego-impl"); - List data = new ArrayList<>(); - for (File file : npnBootModDir.listFiles()) - { - if (Pattern.matches("npn-.*\\.mod",file.getName())) - { - data.add(new Object[] { file.getName() }); - } - } - return data; - } - - @Parameter(value = 0) - public String modBootFile; - - private static BaseHome basehome; - - @BeforeClass - public static void initBaseHome() throws IOException - { - File homeDir = MavenTestingUtils.getProjectDir("src/main/config"); - File baseDir = MavenTestingUtils.getTargetTestingDir(NPNModuleTest.class.getName()); - FS.ensureEmpty(baseDir); - - String cmdLine[] = { "jetty.home="+homeDir.getAbsolutePath(),"jetty.base="+baseDir.getAbsolutePath() }; - basehome = new BaseHome(cmdLine); - } - - /** - * Check the sanity of the npn-boot file module - */ - @Test - public void testModuleValues() throws IOException - { - Path modFile = basehome.getPath("modules/protonego-impl/" + modBootFile); - Module mod = new Module(basehome,modFile); - assertNotNull("module",mod); - - // Validate logical name - assertThat("Module name",mod.getName(),is("protonego-boot")); - - List expectedBootClasspath = new ArrayList<>(); - - for (String line : mod.getFiles()) - { - FileArg farg = new FileArg(line); - if (farg.uri != null) - { - assertThat("NPN URL", farg.uri, startsWith("maven://org.mortbay.jetty.npn/npn-boot/")); - expectedBootClasspath.add("-Xbootclasspath/p:" + farg.location); - } - } - - for (String line : mod.getJvmArgs()) - { - expectedBootClasspath.remove(line); - } - - if (expectedBootClasspath.size() > 0) - { - StringBuilder err = new StringBuilder(); - err.append("XBootClasspath mismatch between [files] and [exec]"); - err.append("\nThe following are inferred from your [files] definition in "); - err.append(modFile.toAbsolutePath().toString()); - err.append("\nbut are not referenced in your [exec] section"); - for (String entry : expectedBootClasspath) - { - err.append("\n").append(entry); - } - fail(err.toString()); - } - } -} diff --git a/jetty-npn/pom.xml b/jetty-npn/pom.xml deleted file mode 100644 index da0f55fe1e8..00000000000 --- a/jetty-npn/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - org.eclipse.jetty - jetty-project - 9.3.0-SNAPSHOT - - 4.0.0 - jetty-npn-parent - pom - Jetty :: NPN :: Parent - - jetty-npn-server - jetty-npn-client - - diff --git a/jetty-osgi/jetty-osgi-npn/pom.xml b/jetty-osgi/jetty-osgi-npn/pom.xml deleted file mode 100644 index 265351b835c..00000000000 --- a/jetty-osgi/jetty-osgi-npn/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - org.eclipse.jetty.osgi - jetty-osgi-project - 9.3.0-SNAPSHOT - - 4.0.0 - jetty-osgi-npn - Jetty :: OSGi NPN Fragment - jar - - org.eclipse.jetty.osgi.npn.fragment - - - - - org.apache.felix - maven-bundle-plugin - - - ${bundle-symbolic-name};singleton:=true - Jetty OSGi NPN Fragment - ${project.name} - !javax.*,!org.eclipse.jetty.* - org.eclipse.jetty.npn;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - system.bundle;extension:=framework - - - - - - - - org.eclipse.jetty.npn - npn-api - ${npn.api.version} - provided - - - diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 02bd25f8d1e..b61ff46e69c 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -25,20 +25,9 @@ jetty-osgi-httpservice test-jetty-osgi-webapp test-jetty-osgi-context - test-jetty-osgi jetty-osgi-alpn + - - - npn - - 1.7 - - - jetty-osgi-npn - - - diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 23dcdcaf6ef..f056f298414 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -11,7 +11,7 @@ Jetty OSGi Integration test http://www.eclipse.org/jetty - ${project.groupId}.boot.test.spdy + ${project.groupId}.boot.test.osgi http://download.eclipse.org/jetty/orbit/ target/distribution 3.5.0 @@ -35,7 +35,7 @@ - + org.ops4j.pax.exam pax-exam-container-forked @@ -279,28 +279,9 @@ runtime - org.eclipse.jetty.spdy - spdy-core + org.eclipse.jetty.http2 + http2-server ${project.version} - test - - - org.eclipse.jetty.spdy - spdy-server - ${project.version} - test - - - org.eclipse.jetty.spdy - spdy-http-server - ${project.version} - test - - - org.eclipse.jetty.spdy - spdy-client - ${project.version} - test org.mortbay.jetty.alpn diff --git a/jetty-osgi/test-jetty-osgi/src/main/resources/jetty-logging.properties b/jetty-osgi/test-jetty-osgi/src/main/resources/jetty-logging.properties index 5250a08562a..147cf004df8 100644 --- a/jetty-osgi/test-jetty-osgi/src/main/resources/jetty-logging.properties +++ b/jetty-osgi/test-jetty-osgi/src/main/resources/jetty-logging.properties @@ -1,2 +1 @@ org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog -org.eclipse.jetty.spdy.LEVEL=WARN diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml deleted file mode 100644 index a0e9d1a11b8..00000000000 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - 3 - - - - - - - - - - - diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml index 1014c8507a0..ef65019001e 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml @@ -4,7 +4,7 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java similarity index 84% rename from jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java rename to jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java index 715b5a9ba16..c0331cbe37f 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java @@ -41,11 +41,11 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; /** - * SPDY setup. + * HTTP2 setup. */ @RunWith(PaxExam.class) //@Ignore -public class TestJettyOSGiBootSpdy +public class TestJettyOSGiBootHTTP2 { private static final String LOG_LEVEL = "WARN"; @@ -57,9 +57,9 @@ public class TestJettyOSGiBootSpdy public Option[] config() { ArrayList