From 7d264e6024efc80124592124891fb6e25b1554af Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 11 Aug 2022 10:23:33 +0200 Subject: [PATCH] Jetty 12 module renaming - jetty-http2. Signed-off-by: Simone Bordet --- documentation/jetty-documentation/pom.xml | 4 ++-- .../programming-guide/client/http2/client-http2.adoc | 2 +- .../programming-guide/server/http2/server-http2.adoc | 2 +- .../docs/programming/client/http/HTTPClientDocs.java | 4 ++-- .../client/websocket/WebSocketClientDocs.java | 4 ++-- javadoc/pom.xml | 6 +++--- jetty-bom/pom.xml | 10 +++++----- .../jetty-alpn/jetty-alpn-conscrypt-client/pom.xml | 2 +- .../jetty-alpn/jetty-alpn-conscrypt-server/pom.xml | 6 +++--- .../conscrypt/server/ConscryptHTTP2ServerTest.java | 2 +- jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml | 2 +- jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml | 2 +- jetty-core/jetty-bom/pom.xml | 10 +++++----- jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml | 2 +- .../pom.xml | 8 ++++---- .../src/main/java/module-info.java | 2 +- .../transport}/ClientConnectionFactoryOverHTTP2.java | 6 +++--- .../transport}/HttpClientTransportOverHTTP2.java | 6 +++--- .../internal/ClientHTTP2StreamEndPoint.java | 2 +- .../internal/HTTPSessionListenerPromise.java | 2 +- .../transport}/internal/HttpChannelOverHTTP2.java | 2 +- .../transport}/internal/HttpConnectionOverHTTP2.java | 2 +- .../transport}/internal/HttpReceiverOverHTTP2.java | 2 +- .../transport}/internal/HttpSenderOverHTTP2.java | 2 +- .../{http2-client => jetty-http2-client}/pom.xml | 6 +++--- .../src/main/java/module-info.java | 0 .../org/eclipse/jetty/http2/client/HTTP2Client.java | 0 .../http2/client/HTTP2ClientConnectionFactory.java | 0 .../http2/client/internal/HTTP2ClientSession.java | 0 .../{http2-common => jetty-http2-common}/pom.xml | 6 +++--- .../src/main/java/module-info.java | 0 .../jetty/http2/AbstractFlowControlStrategy.java | 0 .../jetty/http2/BufferingFlowControlStrategy.java | 0 .../java/org/eclipse/jetty/http2/CloseState.java | 0 .../org/eclipse/jetty/http2/FlowControlStrategy.java | 0 .../java/org/eclipse/jetty/http2/HTTP2Cipher.java | 0 .../java/org/eclipse/jetty/http2/RateControl.java | 0 .../jetty/http2/SimpleFlowControlStrategy.java | 0 .../org/eclipse/jetty/http2/WindowRateControl.java | 0 .../java/org/eclipse/jetty/http2/api/Session.java | 0 .../java/org/eclipse/jetty/http2/api/Stream.java | 0 .../http2/api/server/ServerSessionListener.java | 0 .../jetty/http2/frames/ContinuationFrame.java | 0 .../org/eclipse/jetty/http2/frames/DataFrame.java | 0 .../eclipse/jetty/http2/frames/DisconnectFrame.java | 0 .../org/eclipse/jetty/http2/frames/FailureFrame.java | 0 .../java/org/eclipse/jetty/http2/frames/Frame.java | 0 .../org/eclipse/jetty/http2/frames/FrameType.java | 0 .../org/eclipse/jetty/http2/frames/GoAwayFrame.java | 0 .../org/eclipse/jetty/http2/frames/HeadersFrame.java | 0 .../org/eclipse/jetty/http2/frames/PingFrame.java | 0 .../org/eclipse/jetty/http2/frames/PrefaceFrame.java | 0 .../eclipse/jetty/http2/frames/PriorityFrame.java | 0 .../eclipse/jetty/http2/frames/PushPromiseFrame.java | 0 .../org/eclipse/jetty/http2/frames/ResetFrame.java | 0 .../eclipse/jetty/http2/frames/SettingsFrame.java | 0 .../org/eclipse/jetty/http2/frames/StreamFrame.java | 0 .../org/eclipse/jetty/http2/frames/UnknownFrame.java | 0 .../jetty/http2/frames/WindowUpdateFrame.java | 0 .../org/eclipse/jetty/http2/internal/ErrorCode.java | 0 .../java/org/eclipse/jetty/http2/internal/Flags.java | 0 .../eclipse/jetty/http2/internal/HTTP2Channel.java | 0 .../jetty/http2/internal/HTTP2Connection.java | 0 .../eclipse/jetty/http2/internal/HTTP2Flusher.java | 0 .../eclipse/jetty/http2/internal/HTTP2Session.java | 0 .../eclipse/jetty/http2/internal/HTTP2Stream.java | 0 .../jetty/http2/internal/HTTP2StreamEndPoint.java | 0 .../http2/internal/generator/DataGenerator.java | 0 .../http2/internal/generator/FrameGenerator.java | 0 .../jetty/http2/internal/generator/Generator.java | 0 .../http2/internal/generator/GoAwayGenerator.java | 0 .../http2/internal/generator/HeaderGenerator.java | 0 .../http2/internal/generator/HeadersGenerator.java | 0 .../http2/internal/generator/NoOpGenerator.java | 0 .../http2/internal/generator/PingGenerator.java | 0 .../http2/internal/generator/PrefaceGenerator.java | 0 .../http2/internal/generator/PriorityGenerator.java | 0 .../internal/generator/PushPromiseGenerator.java | 0 .../http2/internal/generator/ResetGenerator.java | 0 .../http2/internal/generator/SettingsGenerator.java | 0 .../internal/generator/WindowUpdateGenerator.java | 0 .../jetty/http2/internal/parser/BodyParser.java | 0 .../internal/parser/ContinuationBodyParser.java | 0 .../jetty/http2/internal/parser/DataBodyParser.java | 0 .../http2/internal/parser/GoAwayBodyParser.java | 0 .../http2/internal/parser/HeaderBlockFragments.java | 0 .../http2/internal/parser/HeaderBlockParser.java | 0 .../jetty/http2/internal/parser/HeaderParser.java | 0 .../http2/internal/parser/HeadersBodyParser.java | 0 .../eclipse/jetty/http2/internal/parser/Parser.java | 0 .../jetty/http2/internal/parser/PingBodyParser.java | 0 .../jetty/http2/internal/parser/PrefaceParser.java | 0 .../http2/internal/parser/PriorityBodyParser.java | 0 .../http2/internal/parser/PushPromiseBodyParser.java | 0 .../jetty/http2/internal/parser/ResetBodyParser.java | 0 .../jetty/http2/internal/parser/ServerParser.java | 0 .../http2/internal/parser/SettingsBodyParser.java | 0 .../http2/internal/parser/UnknownBodyParser.java | 0 .../internal/parser/WindowUpdateBodyParser.java | 0 .../jetty/http2/frames/ContinuationParseTest.java | 0 .../jetty/http2/frames/DataGenerateParseTest.java | 0 .../eclipse/jetty/http2/frames/FrameFloodTest.java | 0 .../jetty/http2/frames/GoAwayGenerateParseTest.java | 0 .../jetty/http2/frames/HeadersGenerateParseTest.java | 0 .../jetty/http2/frames/HeadersTooLargeParseTest.java | 0 .../jetty/http2/frames/MaxFrameSizeParseTest.java | 0 .../jetty/http2/frames/PingGenerateParseTest.java | 0 .../http2/frames/PriorityGenerateParseTest.java | 0 .../http2/frames/PushPromiseGenerateParseTest.java | 0 .../jetty/http2/frames/ResetGenerateParseTest.java | 0 .../http2/frames/SettingsGenerateParseTest.java | 0 .../eclipse/jetty/http2/frames/UnknownParseTest.java | 0 .../http2/frames/WindowUpdateGenerateParseTest.java | 0 .../src/test/resources/jetty-logging.properties | 0 .../{http2-hpack => jetty-http2-hpack}/pom.xml | 4 ++-- .../src/main/java/module-info.java | 0 .../org/eclipse/jetty/http2/hpack/HpackContext.java | 0 .../org/eclipse/jetty/http2/hpack/HpackDecoder.java | 0 .../org/eclipse/jetty/http2/hpack/HpackEncoder.java | 0 .../eclipse/jetty/http2/hpack/HpackException.java | 0 .../jetty/http2/hpack/HpackFieldPreEncoder.java | 0 .../http2/hpack/internal/AuthorityHttpField.java | 0 .../eclipse/jetty/http2/hpack/internal/Huffman.java | 0 .../jetty/http2/hpack/internal/MetaDataBuilder.java | 0 .../jetty/http2/hpack/internal/NBitInteger.java | 0 .../http2/hpack/internal/StaticTableHttpField.java | 0 .../org.eclipse.jetty.http.HttpFieldPreEncoder | 0 .../eclipse/jetty/http2/hpack/HpackContextTest.java | 0 .../eclipse/jetty/http2/hpack/HpackDecoderTest.java | 0 .../eclipse/jetty/http2/hpack/HpackEncoderTest.java | 0 .../org/eclipse/jetty/http2/hpack/HpackPerfTest.java | 0 .../org/eclipse/jetty/http2/hpack/HpackTest.java | 0 .../org/eclipse/jetty/http2/hpack/HuffmanTest.java | 0 .../eclipse/jetty/http2/hpack/NBitIntegerTest.java | 0 .../src/test/resources/data/story_00.json | 0 .../src/test/resources/data/story_01.json | 0 .../src/test/resources/data/story_02.json | 0 .../src/test/resources/data/story_03.json | 0 .../src/test/resources/data/story_04.json | 0 .../src/test/resources/data/story_05.json | 0 .../src/test/resources/data/story_06.json | 0 .../src/test/resources/data/story_07.json | 0 .../src/test/resources/data/story_08.json | 0 .../src/test/resources/data/story_09.json | 0 .../src/test/resources/data/story_10.json | 0 .../src/test/resources/data/story_11.json | 0 .../src/test/resources/data/story_12.json | 0 .../src/test/resources/data/story_13.json | 0 .../src/test/resources/data/story_14.json | 0 .../src/test/resources/data/story_15.json | 0 .../src/test/resources/data/story_16.json | 0 .../src/test/resources/data/story_17.json | 0 .../src/test/resources/data/story_18.json | 0 .../src/test/resources/data/story_19.json | 0 .../src/test/resources/data/story_20.json | 0 .../src/test/resources/data/story_21.json | 0 .../src/test/resources/data/story_22.json | 0 .../src/test/resources/data/story_23.json | 0 .../src/test/resources/data/story_24.json | 0 .../src/test/resources/data/story_25.json | 0 .../src/test/resources/data/story_26.json | 0 .../src/test/resources/data/story_27.json | 0 .../src/test/resources/data/story_28.json | 0 .../src/test/resources/data/story_29.json | 0 .../src/test/resources/data/story_30.json | 0 .../src/test/resources/data/story_31.json | 0 .../src/test/resources/jetty-logging.properties | 0 .../{http2-server => jetty-http2-server}/pom.xml | 6 +++--- .../src/main/config/etc/jetty-http2.xml | 0 .../src/main/config/etc/jetty-http2c.xml | 0 .../src/main/config/modules/http2.mod | 0 .../src/main/config/modules/http2c.mod | 0 .../src/main/java/module-info.java | 0 .../server/AbstractHTTP2ServerConnectionFactory.java | 0 .../jetty/http2/server/ContentDemander_state.puml | 0 .../http2/server/HTTP2CServerConnectionFactory.java | 0 .../http2/server/HTTP2ServerConnectionFactory.java | 0 .../server/RawHTTP2ServerConnectionFactory.java | 0 .../http2/server/internal/HTTP2ServerConnection.java | 0 .../http2/server/internal/HTTP2ServerSession.java | 0 .../http2/server/internal/HttpChannelOverHTTP2.java | 0 .../http2/server/internal/HttpStreamOverHTTP2.java | 0 .../server/internal/HttpTransportOverHTTP2.java | 0 .../server/internal/ServerHTTP2StreamEndPoint.java | 0 jetty-core/jetty-http2/jetty-http2-tests/pom.xml | 8 ++++---- .../org/eclipse/jetty/http2/tests/AbstractTest.java | 2 +- .../tests/HttpClientTransportOverHTTP2Test.java | 6 +++--- .../jetty/http2/tests/MaxConcurrentStreamsTest.java | 2 +- .../http2/tests/MultiplexedConnectionPoolTest.java | 2 +- .../http2/tests/PriorKnowledgeHTTP2OverTLSTest.java | 2 +- jetty-core/jetty-http2/pom.xml | 12 ++++++------ jetty-core/jetty-http3/http3-tests/pom.xml | 2 +- jetty-core/jetty-quic/quic-client/pom.xml | 4 ++-- .../eclipse/jetty/quic/client/End2EndClientTest.java | 2 +- .../jetty-ee10-demo-embedded/pom.xml | 2 +- .../jetty-ee10-demo-proxy-webapp/pom.xml | 2 +- .../jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml | 8 ++++---- .../osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java | 12 ++++++------ .../ee10/osgi/test/TestJettyOSGiBootHTTP2JDK9.java | 12 ++++++------ .../jetty-ee10-test-http-client-transport/pom.xml | 4 ++-- .../jetty/ee10/http/client/AsyncIOServletTest.java | 2 +- .../ee10/http/client/HttpChannelAssociationTest.java | 6 +++--- .../http/client/HttpClientTransportDynamicTest.java | 2 +- .../http/client/ProxyWithDynamicTransportTest.java | 2 +- .../jetty/ee10/http/client/ServerTimeoutsTest.java | 2 +- .../jetty/ee10/http/client/TransportScenario.java | 2 +- .../jetty-ee10-test-http2-webapp/pom.xml | 4 ++-- .../jetty-ee10-test-integration/pom.xml | 2 +- .../jetty-ee10-websocket-jetty-tests/pom.xml | 4 ++-- .../ee10/websocket/tests/WebSocketOverHTTP2Test.java | 2 +- .../jetty-ee8-websocket-jetty-tests/pom.xml | 4 ++-- .../jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml | 2 +- .../jetty-ee9-demo-proxy-webapp/pom.xml | 2 +- jetty-ee9/jetty-ee9-fcgi-server-proxy/pom.xml | 2 +- jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml | 8 ++++---- .../osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java | 12 ++++++------ .../ee9/osgi/test/TestJettyOSGiBootHTTP2JDK9.java | 12 ++++++------ .../jetty-ee9-test-http-client-transport/pom.xml | 4 ++-- .../jetty/ee9/http/client/AsyncIOServletTest.java | 2 +- .../ee9/http/client/HttpChannelAssociationTest.java | 6 +++--- .../http/client/HttpClientTransportDynamicTest.java | 2 +- .../http/client/ProxyWithDynamicTransportTest.java | 2 +- .../jetty/ee9/http/client/ServerTimeoutsTest.java | 2 +- .../jetty/ee9/http/client/TransportScenario.java | 2 +- .../jetty-ee9-test-http2-webapp/pom.xml | 4 ++-- .../jetty-ee9-test-integration/pom.xml | 2 +- .../jetty-ee9-websocket-jetty-tests/pom.xml | 4 ++-- .../ee9/websocket/tests/WebSocketOverHTTP2Test.java | 2 +- jetty-home/pom.xml | 6 +++--- pom.xml | 10 +++++----- .../test-distribution-common/pom.xml | 4 ++-- .../jetty/tests/distribution/DistributionTests.java | 2 +- .../test-distribution/test-ee10-distribution/pom.xml | 2 +- .../test-distribution/test-ee9-distribution/pom.xml | 2 +- 234 files changed, 162 insertions(+), 162 deletions(-) rename jetty-core/jetty-http2/{http2-http-client-transport => jetty-http2-client-transport}/pom.xml (83%) rename jetty-core/jetty-http2/{http2-http-client-transport => jetty-http2-client-transport}/src/main/java/module-info.java (93%) rename jetty-core/jetty-http2/{http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http => jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport}/ClientConnectionFactoryOverHTTP2.java (96%) rename jetty-core/jetty-http2/{http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http => jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport}/HttpClientTransportOverHTTP2.java (97%) rename jetty-core/jetty-http2/{http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http => jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport}/internal/ClientHTTP2StreamEndPoint.java (96%) rename jetty-core/jetty-http2/{http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http => jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport}/internal/HTTPSessionListenerPromise.java (98%) rename jetty-core/jetty-http2/{http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http => jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport}/internal/HttpChannelOverHTTP2.java (99%) rename jetty-core/jetty-http2/{http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http => jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport}/internal/HttpConnectionOverHTTP2.java (99%) rename jetty-core/jetty-http2/{http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http => jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport}/internal/HttpReceiverOverHTTP2.java (99%) rename jetty-core/jetty-http2/{http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http => jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport}/internal/HttpSenderOverHTTP2.java (99%) rename jetty-core/jetty-http2/{http2-client => jetty-http2-client}/pom.xml (90%) rename jetty-core/jetty-http2/{http2-client => jetty-http2-client}/src/main/java/module-info.java (100%) rename jetty-core/jetty-http2/{http2-client => jetty-http2-client}/src/main/java/org/eclipse/jetty/http2/client/HTTP2Client.java (100%) rename jetty-core/jetty-http2/{http2-client => jetty-http2-client}/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientConnectionFactory.java (100%) rename jetty-core/jetty-http2/{http2-client => jetty-http2-client}/src/main/java/org/eclipse/jetty/http2/client/internal/HTTP2ClientSession.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/pom.xml (90%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/module-info.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/AbstractFlowControlStrategy.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/BufferingFlowControlStrategy.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/CloseState.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/FlowControlStrategy.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/HTTP2Cipher.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/RateControl.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/SimpleFlowControlStrategy.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/WindowRateControl.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/api/Session.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/api/Stream.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/api/server/ServerSessionListener.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/ContinuationFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/DataFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/DisconnectFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/FailureFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/Frame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/FrameType.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/GoAwayFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/HeadersFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/PingFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/PrefaceFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/PriorityFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/PushPromiseFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/ResetFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/SettingsFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/StreamFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/UnknownFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/frames/WindowUpdateFrame.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/ErrorCode.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/Flags.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Channel.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Connection.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Flusher.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Session.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Stream.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/HTTP2StreamEndPoint.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/DataGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/FrameGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/Generator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/GoAwayGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/HeaderGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/HeadersGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/NoOpGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/PingGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/PrefaceGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/PriorityGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/PushPromiseGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/ResetGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/SettingsGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/generator/WindowUpdateGenerator.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/BodyParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/ContinuationBodyParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/DataBodyParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/GoAwayBodyParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderBlockFragments.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderBlockParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/HeadersBodyParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/Parser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/PingBodyParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/PrefaceParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/PriorityBodyParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/PushPromiseBodyParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/ResetBodyParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/ServerParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/SettingsBodyParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/UnknownBodyParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/main/java/org/eclipse/jetty/http2/internal/parser/WindowUpdateBodyParser.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/DataGenerateParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/GoAwayGenerateParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/HeadersGenerateParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/HeadersTooLargeParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/MaxFrameSizeParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/PingGenerateParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/PriorityGenerateParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/PushPromiseGenerateParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/ResetGenerateParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/SettingsGenerateParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/UnknownParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/java/org/eclipse/jetty/http2/frames/WindowUpdateGenerateParseTest.java (100%) rename jetty-core/jetty-http2/{http2-common => jetty-http2-common}/src/test/resources/jetty-logging.properties (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/pom.xml (96%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/main/java/module-info.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/main/java/org/eclipse/jetty/http2/hpack/HpackDecoder.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/main/java/org/eclipse/jetty/http2/hpack/HpackEncoder.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/main/java/org/eclipse/jetty/http2/hpack/HpackException.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/main/java/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/main/java/org/eclipse/jetty/http2/hpack/internal/AuthorityHttpField.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/main/java/org/eclipse/jetty/http2/hpack/internal/Huffman.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/main/java/org/eclipse/jetty/http2/hpack/internal/MetaDataBuilder.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/main/java/org/eclipse/jetty/http2/hpack/internal/NBitInteger.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/main/java/org/eclipse/jetty/http2/hpack/internal/StaticTableHttpField.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/main/resources/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/java/org/eclipse/jetty/http2/hpack/HpackContextTest.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/java/org/eclipse/jetty/http2/hpack/HpackDecoderTest.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/java/org/eclipse/jetty/http2/hpack/HpackEncoderTest.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/java/org/eclipse/jetty/http2/hpack/HpackPerfTest.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/java/org/eclipse/jetty/http2/hpack/HpackTest.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/java/org/eclipse/jetty/http2/hpack/HuffmanTest.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/java/org/eclipse/jetty/http2/hpack/NBitIntegerTest.java (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_00.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_01.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_02.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_03.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_04.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_05.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_06.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_07.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_08.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_09.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_10.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_11.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_12.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_13.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_14.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_15.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_16.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_17.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_18.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_19.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_20.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_21.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_22.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_23.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_24.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_25.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_26.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_27.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_28.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_29.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_30.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/data/story_31.json (100%) rename jetty-core/jetty-http2/{http2-hpack => jetty-http2-hpack}/src/test/resources/jetty-logging.properties (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/pom.xml (90%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/config/etc/jetty-http2.xml (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/config/etc/jetty-http2c.xml (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/config/modules/http2.mod (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/config/modules/http2c.mod (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/java/module-info.java (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/java/org/eclipse/jetty/http2/server/ContentDemander_state.puml (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/java/org/eclipse/jetty/http2/server/HTTP2CServerConnectionFactory.java (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/java/org/eclipse/jetty/http2/server/RawHTTP2ServerConnectionFactory.java (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerConnection.java (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerSession.java (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/java/org/eclipse/jetty/http2/server/internal/HttpChannelOverHTTP2.java (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/java/org/eclipse/jetty/http2/server/internal/HttpStreamOverHTTP2.java (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/java/org/eclipse/jetty/http2/server/internal/HttpTransportOverHTTP2.java (100%) rename jetty-core/jetty-http2/{http2-server => jetty-http2-server}/src/main/java/org/eclipse/jetty/http2/server/internal/ServerHTTP2StreamEndPoint.java (100%) diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index 8e93559f697..0ebdaf02519 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -202,11 +202,11 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport org.eclipse.jetty.http3 diff --git a/documentation/jetty-documentation/src/main/asciidoc/programming-guide/client/http2/client-http2.adoc b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/client/http2/client-http2.adoc index e04c1bfffa2..607b78bca4e 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/programming-guide/client/http2/client-http2.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/client/http2/client-http2.adoc @@ -31,7 +31,7 @@ The Maven artifact coordinates for the HTTP/2 client library are the following: ---- org.eclipse.jetty.http2 - http2-client + jetty-http2-client {version} ---- diff --git a/documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/http2/server-http2.adoc b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/http2/server-http2.adoc index 6c2f8e146b3..56dc2ccf768 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/http2/server-http2.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/http2/server-http2.adoc @@ -29,7 +29,7 @@ The Maven artifact coordinates for the HTTP/2 client library are the following: ---- org.eclipse.jetty.http2 - http2-server + jetty-http2-server {version} ---- diff --git a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java index 33dea519221..9603b1cc4c4 100644 --- a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java +++ b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java @@ -60,8 +60,8 @@ import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.ClientConnectionFactoryOverHTTP2; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.ClientConnectionFactoryOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.http3.client.HTTP3Client; import org.eclipse.jetty.http3.client.http.HttpClientTransportOverHTTP3; import org.eclipse.jetty.io.ByteBufferPool; diff --git a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/websocket/WebSocketClientDocs.java b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/websocket/WebSocketClientDocs.java index b7187224efe..e1078a0fb4c 100644 --- a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/websocket/WebSocketClientDocs.java +++ b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/websocket/WebSocketClientDocs.java @@ -27,8 +27,8 @@ import org.eclipse.jetty.ee10.websocket.client.ClientUpgradeRequest; import org.eclipse.jetty.ee10.websocket.client.JettyUpgradeListener; import org.eclipse.jetty.ee10.websocket.client.WebSocketClient; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.ClientConnectionFactoryOverHTTP2; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.ClientConnectionFactoryOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.util.component.LifeCycle; @SuppressWarnings("unused") diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 306b5898914..0864d39dd8c 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -237,17 +237,17 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client provided org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport provided org.eclipse.jetty.http2 - http2-server + jetty-http2-server provided diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 5e6e5aa1b73..05f42860831 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -149,27 +149,27 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client 12.0.0-SNAPSHOT org.eclipse.jetty.http2 - http2-common + jetty-http2-common 12.0.0-SNAPSHOT org.eclipse.jetty.http2 - http2-hpack + jetty-http2-hpack 12.0.0-SNAPSHOT org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport 12.0.0-SNAPSHOT org.eclipse.jetty.http2 - http2-server + jetty-http2-server 12.0.0-SNAPSHOT diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index a8b250f5369..485ef9446a7 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -30,7 +30,7 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client test diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index f808be03a13..71385692911 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -38,7 +38,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test @@ -53,12 +53,12 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client test org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java index 067085038da..ac7e5ba7ca2 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java @@ -23,7 +23,7 @@ import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.server.Handler; diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml index a355b1bdc80..4303ea710a3 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client test diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml index 84a52a4993b..8325ac33b7d 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -60,7 +60,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test diff --git a/jetty-core/jetty-bom/pom.xml b/jetty-core/jetty-bom/pom.xml index e5b1a8f8dda..2c6ccb6ef90 100644 --- a/jetty-core/jetty-bom/pom.xml +++ b/jetty-core/jetty-bom/pom.xml @@ -129,27 +129,27 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client 12.0.0-SNAPSHOT org.eclipse.jetty.http2 - http2-common + jetty-http2-common 12.0.0-SNAPSHOT org.eclipse.jetty.http2 - http2-hpack + jetty-http2-hpack 12.0.0-SNAPSHOT org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport 12.0.0-SNAPSHOT org.eclipse.jetty.http2 - http2-server + jetty-http2-server 12.0.0-SNAPSHOT diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml index fcdc000665a..95b20fdb808 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml @@ -39,7 +39,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test diff --git a/jetty-core/jetty-http2/http2-http-client-transport/pom.xml b/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml similarity index 83% rename from jetty-core/jetty-http2/http2-http-client-transport/pom.xml rename to jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml index 8c8088b7d46..c4fad981ed5 100644 --- a/jetty-core/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml @@ -2,13 +2,13 @@ org.eclipse.jetty.http2 - http2 + jetty-http2 12.0.0-SNAPSHOT 4.0.0 - http2-http-client-transport - Jetty Core :: HTTP2 :: HTTP Client Transport + jetty-http2-client-transport + Jetty Core :: HTTP2 :: Client Transport ${project.groupId}.client.http @@ -21,7 +21,7 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client org.eclipse.jetty diff --git a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/module-info.java b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/module-info.java similarity index 93% rename from jetty-core/jetty-http2/http2-http-client-transport/src/main/java/module-info.java rename to jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/module-info.java index d09d1210652..6c90a87b1f6 100644 --- a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/module-info.java +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/module-info.java @@ -19,5 +19,5 @@ module org.eclipse.jetty.http2.http.client.transport requires transitive org.eclipse.jetty.client; requires transitive org.eclipse.jetty.http2.client; - exports org.eclipse.jetty.http2.client.http; + exports org.eclipse.jetty.http2.client.transport; } diff --git a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/ClientConnectionFactoryOverHTTP2.java b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/ClientConnectionFactoryOverHTTP2.java similarity index 96% rename from jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/ClientConnectionFactoryOverHTTP2.java rename to jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/ClientConnectionFactoryOverHTTP2.java index 5a7957e7bed..5ee5b5b29ab 100644 --- a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/ClientConnectionFactoryOverHTTP2.java +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/ClientConnectionFactoryOverHTTP2.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http2.client.http; +package org.eclipse.jetty.http2.client.transport; import java.io.IOException; import java.io.UncheckedIOException; @@ -25,8 +25,8 @@ import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic; import org.eclipse.jetty.client.http.HttpClientConnectionFactory; import org.eclipse.jetty.http2.client.HTTP2Client; import org.eclipse.jetty.http2.client.HTTP2ClientConnectionFactory; -import org.eclipse.jetty.http2.client.http.internal.HTTPSessionListenerPromise; -import org.eclipse.jetty.http2.client.http.internal.HttpConnectionOverHTTP2; +import org.eclipse.jetty.http2.client.transport.internal.HTTPSessionListenerPromise; +import org.eclipse.jetty.http2.client.transport.internal.HttpConnectionOverHTTP2; import org.eclipse.jetty.io.ClientConnectionFactory; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.io.ssl.SslClientConnectionFactory; diff --git a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpClientTransportOverHTTP2.java b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/HttpClientTransportOverHTTP2.java similarity index 97% rename from jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpClientTransportOverHTTP2.java rename to jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/HttpClientTransportOverHTTP2.java index 90f4e2de1e2..8978a541d45 100644 --- a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpClientTransportOverHTTP2.java +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/HttpClientTransportOverHTTP2.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http2.client.http; +package org.eclipse.jetty.http2.client.transport; import java.io.IOException; import java.net.InetSocketAddress; @@ -33,8 +33,8 @@ import org.eclipse.jetty.http.HttpScheme; import org.eclipse.jetty.http2.api.Session; import org.eclipse.jetty.http2.client.HTTP2Client; import org.eclipse.jetty.http2.client.HTTP2ClientConnectionFactory; -import org.eclipse.jetty.http2.client.http.internal.HTTPSessionListenerPromise; -import org.eclipse.jetty.http2.client.http.internal.HttpConnectionOverHTTP2; +import org.eclipse.jetty.http2.client.transport.internal.HTTPSessionListenerPromise; +import org.eclipse.jetty.http2.client.transport.internal.HttpConnectionOverHTTP2; import org.eclipse.jetty.http2.frames.GoAwayFrame; import org.eclipse.jetty.io.ClientConnectionFactory; import org.eclipse.jetty.io.EndPoint; diff --git a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/ClientHTTP2StreamEndPoint.java b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/ClientHTTP2StreamEndPoint.java similarity index 96% rename from jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/ClientHTTP2StreamEndPoint.java rename to jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/ClientHTTP2StreamEndPoint.java index 56a241c70fd..829ffb479b0 100644 --- a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/ClientHTTP2StreamEndPoint.java +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/ClientHTTP2StreamEndPoint.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http2.client.http.internal; +package org.eclipse.jetty.http2.client.transport.internal; import org.eclipse.jetty.http2.internal.HTTP2Channel; import org.eclipse.jetty.http2.internal.HTTP2Stream; diff --git a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HTTPSessionListenerPromise.java b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HTTPSessionListenerPromise.java similarity index 98% rename from jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HTTPSessionListenerPromise.java rename to jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HTTPSessionListenerPromise.java index e799ee538ba..895606d14bd 100644 --- a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HTTPSessionListenerPromise.java +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HTTPSessionListenerPromise.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http2.client.http.internal; +package org.eclipse.jetty.http2.client.transport.internal; import java.nio.channels.ClosedChannelException; import java.util.Map; diff --git a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpChannelOverHTTP2.java b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpChannelOverHTTP2.java similarity index 99% rename from jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpChannelOverHTTP2.java rename to jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpChannelOverHTTP2.java index 9ec56da4f8d..523d0f08e0d 100644 --- a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpChannelOverHTTP2.java +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpChannelOverHTTP2.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http2.client.http.internal; +package org.eclipse.jetty.http2.client.transport.internal; import org.eclipse.jetty.client.HttpChannel; import org.eclipse.jetty.client.HttpDestination; diff --git a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpConnectionOverHTTP2.java b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpConnectionOverHTTP2.java similarity index 99% rename from jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpConnectionOverHTTP2.java rename to jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpConnectionOverHTTP2.java index d3945e7c818..02d9b385a4c 100644 --- a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpConnectionOverHTTP2.java +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpConnectionOverHTTP2.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http2.client.http.internal; +package org.eclipse.jetty.http2.client.transport.internal; import java.nio.channels.AsynchronousCloseException; import java.util.Iterator; diff --git a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpReceiverOverHTTP2.java b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpReceiverOverHTTP2.java similarity index 99% rename from jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpReceiverOverHTTP2.java rename to jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpReceiverOverHTTP2.java index aafb2aa44f6..db146c971bd 100644 --- a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpReceiverOverHTTP2.java +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpReceiverOverHTTP2.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http2.client.http.internal; +package org.eclipse.jetty.http2.client.transport.internal; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpSenderOverHTTP2.java b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpSenderOverHTTP2.java similarity index 99% rename from jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpSenderOverHTTP2.java rename to jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpSenderOverHTTP2.java index e99defbc041..02c82ff5463 100644 --- a/jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpSenderOverHTTP2.java +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpSenderOverHTTP2.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http2.client.http.internal; +package org.eclipse.jetty.http2.client.transport.internal; import java.nio.ByteBuffer; import java.util.function.Supplier; diff --git a/jetty-core/jetty-http2/http2-client/pom.xml b/jetty-core/jetty-http2/jetty-http2-client/pom.xml similarity index 90% rename from jetty-core/jetty-http2/http2-client/pom.xml rename to jetty-core/jetty-http2/jetty-http2-client/pom.xml index a111b59d912..281859a47d1 100644 --- a/jetty-core/jetty-http2/http2-client/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-client/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.http2 - http2 + jetty-http2 12.0.0-SNAPSHOT 4.0.0 - http2-client + jetty-http2-client Jetty Core :: HTTP2 :: Client @@ -31,7 +31,7 @@ org.eclipse.jetty.http2 - http2-common + jetty-http2-common org.eclipse.jetty diff --git a/jetty-core/jetty-http2/http2-client/src/main/java/module-info.java b/jetty-core/jetty-http2/jetty-http2-client/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-http2/http2-client/src/main/java/module-info.java rename to jetty-core/jetty-http2/jetty-http2-client/src/main/java/module-info.java diff --git a/jetty-core/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2Client.java b/jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2Client.java similarity index 100% rename from jetty-core/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2Client.java rename to jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2Client.java diff --git a/jetty-core/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientConnectionFactory.java b/jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientConnectionFactory.java similarity index 100% rename from jetty-core/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientConnectionFactory.java rename to jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientConnectionFactory.java diff --git a/jetty-core/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/internal/HTTP2ClientSession.java b/jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/internal/HTTP2ClientSession.java similarity index 100% rename from jetty-core/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/internal/HTTP2ClientSession.java rename to jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/internal/HTTP2ClientSession.java diff --git a/jetty-core/jetty-http2/http2-common/pom.xml b/jetty-core/jetty-http2/jetty-http2-common/pom.xml similarity index 90% rename from jetty-core/jetty-http2/http2-common/pom.xml rename to jetty-core/jetty-http2/jetty-http2-common/pom.xml index 0b71ab3b1ef..a13c5bcea93 100644 --- a/jetty-core/jetty-http2/http2-common/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-common/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.http2 - http2 + jetty-http2 12.0.0-SNAPSHOT 4.0.0 - http2-common + jetty-http2-common Jetty Core :: HTTP2 :: Common @@ -17,7 +17,7 @@ org.eclipse.jetty.http2 - http2-hpack + jetty-http2-hpack org.slf4j diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/module-info.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/module-info.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/module-info.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/AbstractFlowControlStrategy.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/AbstractFlowControlStrategy.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/AbstractFlowControlStrategy.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/AbstractFlowControlStrategy.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/BufferingFlowControlStrategy.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/BufferingFlowControlStrategy.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/BufferingFlowControlStrategy.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/BufferingFlowControlStrategy.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/CloseState.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/CloseState.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/CloseState.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/CloseState.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/FlowControlStrategy.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/FlowControlStrategy.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/FlowControlStrategy.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/FlowControlStrategy.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Cipher.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Cipher.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Cipher.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Cipher.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/RateControl.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/RateControl.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/RateControl.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/RateControl.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/SimpleFlowControlStrategy.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/SimpleFlowControlStrategy.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/SimpleFlowControlStrategy.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/SimpleFlowControlStrategy.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/WindowRateControl.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/WindowRateControl.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/WindowRateControl.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/WindowRateControl.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/api/Session.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Session.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/api/Session.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Session.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/api/Stream.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Stream.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/api/Stream.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Stream.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/api/server/ServerSessionListener.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/server/ServerSessionListener.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/api/server/ServerSessionListener.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/server/ServerSessionListener.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/ContinuationFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/ContinuationFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/ContinuationFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/ContinuationFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/DataFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/DataFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/DataFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/DataFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/DisconnectFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/DisconnectFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/DisconnectFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/DisconnectFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/FailureFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/FailureFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/FailureFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/FailureFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/Frame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/Frame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/Frame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/Frame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/FrameType.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/FrameType.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/FrameType.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/FrameType.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/GoAwayFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/GoAwayFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/GoAwayFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/GoAwayFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/HeadersFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/HeadersFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/HeadersFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/HeadersFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/PingFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/PingFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/PingFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/PingFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/PrefaceFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/PrefaceFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/PrefaceFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/PrefaceFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/PriorityFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/PriorityFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/PriorityFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/PriorityFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/PushPromiseFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/PushPromiseFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/PushPromiseFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/PushPromiseFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/ResetFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/ResetFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/ResetFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/ResetFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/SettingsFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/SettingsFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/SettingsFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/SettingsFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/StreamFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/StreamFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/StreamFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/StreamFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/UnknownFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/UnknownFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/UnknownFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/UnknownFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/WindowUpdateFrame.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/WindowUpdateFrame.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/WindowUpdateFrame.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/WindowUpdateFrame.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/ErrorCode.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/ErrorCode.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/ErrorCode.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/ErrorCode.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/Flags.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/Flags.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/Flags.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/Flags.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Channel.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Channel.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Channel.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Channel.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Connection.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Connection.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Connection.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Connection.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Flusher.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Flusher.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Flusher.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Flusher.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Session.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Session.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Session.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Session.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Stream.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Stream.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Stream.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Stream.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2StreamEndPoint.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2StreamEndPoint.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2StreamEndPoint.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2StreamEndPoint.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/DataGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/DataGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/DataGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/DataGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/FrameGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/FrameGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/FrameGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/FrameGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/Generator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/Generator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/Generator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/Generator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/GoAwayGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/GoAwayGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/GoAwayGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/GoAwayGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/HeaderGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/HeaderGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/HeaderGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/HeaderGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/HeadersGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/HeadersGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/HeadersGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/HeadersGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/NoOpGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/NoOpGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/NoOpGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/NoOpGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PingGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PingGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PingGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PingGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PrefaceGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PrefaceGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PrefaceGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PrefaceGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PriorityGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PriorityGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PriorityGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PriorityGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PushPromiseGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PushPromiseGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PushPromiseGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/PushPromiseGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/ResetGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/ResetGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/ResetGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/ResetGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/SettingsGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/SettingsGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/SettingsGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/SettingsGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/WindowUpdateGenerator.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/WindowUpdateGenerator.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/WindowUpdateGenerator.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/generator/WindowUpdateGenerator.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/BodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/BodyParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/BodyParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/BodyParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/ContinuationBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/ContinuationBodyParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/ContinuationBodyParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/ContinuationBodyParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/DataBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/DataBodyParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/DataBodyParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/DataBodyParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/GoAwayBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/GoAwayBodyParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/GoAwayBodyParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/GoAwayBodyParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderBlockFragments.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderBlockFragments.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderBlockFragments.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderBlockFragments.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderBlockParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderBlockParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderBlockParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderBlockParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeaderParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeadersBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeadersBodyParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeadersBodyParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/HeadersBodyParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/Parser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/Parser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/Parser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/Parser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PingBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PingBodyParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PingBodyParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PingBodyParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PrefaceParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PrefaceParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PrefaceParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PrefaceParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PriorityBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PriorityBodyParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PriorityBodyParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PriorityBodyParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PushPromiseBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PushPromiseBodyParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PushPromiseBodyParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/PushPromiseBodyParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/ResetBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/ResetBodyParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/ResetBodyParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/ResetBodyParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/ServerParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/ServerParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/ServerParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/ServerParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/SettingsBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/SettingsBodyParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/SettingsBodyParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/SettingsBodyParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/UnknownBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/UnknownBodyParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/UnknownBodyParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/UnknownBodyParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/WindowUpdateBodyParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/WindowUpdateBodyParser.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/WindowUpdateBodyParser.java rename to jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/parser/WindowUpdateBodyParser.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/ContinuationParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/DataGenerateParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/DataGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/DataGenerateParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/DataGenerateParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/FrameFloodTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/GoAwayGenerateParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/GoAwayGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/GoAwayGenerateParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/GoAwayGenerateParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/HeadersGenerateParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/HeadersGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/HeadersGenerateParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/HeadersGenerateParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/HeadersTooLargeParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/HeadersTooLargeParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/HeadersTooLargeParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/HeadersTooLargeParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/MaxFrameSizeParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/MaxFrameSizeParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/MaxFrameSizeParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/MaxFrameSizeParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/PingGenerateParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/PingGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/PingGenerateParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/PingGenerateParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/PriorityGenerateParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/PriorityGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/PriorityGenerateParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/PriorityGenerateParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/PushPromiseGenerateParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/PushPromiseGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/PushPromiseGenerateParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/PushPromiseGenerateParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/ResetGenerateParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/ResetGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/ResetGenerateParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/ResetGenerateParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/SettingsGenerateParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/SettingsGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/SettingsGenerateParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/SettingsGenerateParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/UnknownParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/UnknownParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/UnknownParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/UnknownParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/WindowUpdateGenerateParseTest.java b/jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/WindowUpdateGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/java/org/eclipse/jetty/http2/frames/WindowUpdateGenerateParseTest.java rename to jetty-core/jetty-http2/jetty-http2-common/src/test/java/org/eclipse/jetty/http2/frames/WindowUpdateGenerateParseTest.java diff --git a/jetty-core/jetty-http2/http2-common/src/test/resources/jetty-logging.properties b/jetty-core/jetty-http2/jetty-http2-common/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-core/jetty-http2/http2-common/src/test/resources/jetty-logging.properties rename to jetty-core/jetty-http2/jetty-http2-common/src/test/resources/jetty-logging.properties diff --git a/jetty-core/jetty-http2/http2-hpack/pom.xml b/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml similarity index 96% rename from jetty-core/jetty-http2/http2-hpack/pom.xml rename to jetty-core/jetty-http2/jetty-http2-hpack/pom.xml index e378afd937f..979a38b4e03 100644 --- a/jetty-core/jetty-http2/http2-hpack/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.http2 - http2 + jetty-http2 12.0.0-SNAPSHOT 4.0.0 - http2-hpack + jetty-http2-hpack Jetty Core :: HTTP2 :: HPACK diff --git a/jetty-core/jetty-http2/http2-hpack/src/main/java/module-info.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/main/java/module-info.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/module-info.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackDecoder.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackDecoder.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackDecoder.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackDecoder.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackEncoder.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackEncoder.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackEncoder.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackEncoder.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackException.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackException.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackException.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackException.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/AuthorityHttpField.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/AuthorityHttpField.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/AuthorityHttpField.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/AuthorityHttpField.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/Huffman.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/Huffman.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/Huffman.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/Huffman.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/MetaDataBuilder.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/MetaDataBuilder.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/MetaDataBuilder.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/MetaDataBuilder.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/NBitInteger.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/NBitInteger.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/NBitInteger.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/NBitInteger.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/StaticTableHttpField.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/StaticTableHttpField.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/StaticTableHttpField.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/internal/StaticTableHttpField.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/main/resources/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder b/jetty-core/jetty-http2/jetty-http2-hpack/src/main/resources/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/main/resources/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder rename to jetty-core/jetty-http2/jetty-http2-hpack/src/main/resources/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackContextTest.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackContextTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackContextTest.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackContextTest.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackDecoderTest.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackDecoderTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackDecoderTest.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackDecoderTest.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackEncoderTest.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackEncoderTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackEncoderTest.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackEncoderTest.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackPerfTest.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackPerfTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackPerfTest.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackPerfTest.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackTest.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackTest.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackTest.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HuffmanTest.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HuffmanTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HuffmanTest.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HuffmanTest.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/NBitIntegerTest.java b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/NBitIntegerTest.java similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/NBitIntegerTest.java rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/NBitIntegerTest.java diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_00.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_00.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_00.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_00.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_01.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_01.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_01.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_01.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_02.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_02.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_02.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_02.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_03.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_03.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_03.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_03.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_04.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_04.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_04.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_04.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_05.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_05.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_05.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_05.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_06.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_06.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_06.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_06.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_07.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_07.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_07.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_07.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_08.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_08.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_08.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_08.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_09.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_09.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_09.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_09.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_10.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_10.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_10.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_10.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_11.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_11.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_11.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_11.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_12.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_12.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_12.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_12.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_13.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_13.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_13.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_13.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_14.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_14.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_14.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_14.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_15.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_15.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_15.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_15.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_16.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_16.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_16.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_16.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_17.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_17.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_17.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_17.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_18.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_18.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_18.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_18.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_19.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_19.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_19.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_19.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_20.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_20.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_20.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_20.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_21.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_21.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_21.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_21.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_22.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_22.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_22.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_22.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_23.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_23.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_23.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_23.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_24.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_24.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_24.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_24.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_25.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_25.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_25.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_25.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_26.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_26.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_26.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_26.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_27.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_27.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_27.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_27.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_28.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_28.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_28.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_28.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_29.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_29.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_29.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_29.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_30.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_30.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_30.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_30.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_31.json b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_31.json similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/data/story_31.json rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/data/story_31.json diff --git a/jetty-core/jetty-http2/http2-hpack/src/test/resources/jetty-logging.properties b/jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-core/jetty-http2/http2-hpack/src/test/resources/jetty-logging.properties rename to jetty-core/jetty-http2/jetty-http2-hpack/src/test/resources/jetty-logging.properties diff --git a/jetty-core/jetty-http2/http2-server/pom.xml b/jetty-core/jetty-http2/jetty-http2-server/pom.xml similarity index 90% rename from jetty-core/jetty-http2/http2-server/pom.xml rename to jetty-core/jetty-http2/jetty-http2-server/pom.xml index 1731587ca13..2c156da500b 100644 --- a/jetty-core/jetty-http2/http2-server/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-server/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.http2 - http2 + jetty-http2 12.0.0-SNAPSHOT 4.0.0 - http2-server + jetty-http2-server Jetty Core :: HTTP2 :: Server @@ -18,7 +18,7 @@ org.eclipse.jetty.http2 - http2-common + jetty-http2-common org.eclipse.jetty diff --git a/jetty-core/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml rename to jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml diff --git a/jetty-core/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml rename to jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml diff --git a/jetty-core/jetty-http2/http2-server/src/main/config/modules/http2.mod b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/modules/http2.mod similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/config/modules/http2.mod rename to jetty-core/jetty-http2/jetty-http2-server/src/main/config/modules/http2.mod diff --git a/jetty-core/jetty-http2/http2-server/src/main/config/modules/http2c.mod b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/modules/http2c.mod similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/config/modules/http2c.mod rename to jetty-core/jetty-http2/jetty-http2-server/src/main/config/modules/http2c.mod diff --git a/jetty-core/jetty-http2/http2-server/src/main/java/module-info.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/java/module-info.java rename to jetty-core/jetty-http2/jetty-http2-server/src/main/java/module-info.java diff --git a/jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java rename to jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/AbstractHTTP2ServerConnectionFactory.java diff --git a/jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/ContentDemander_state.puml b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/ContentDemander_state.puml similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/ContentDemander_state.puml rename to jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/ContentDemander_state.puml diff --git a/jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2CServerConnectionFactory.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2CServerConnectionFactory.java similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2CServerConnectionFactory.java rename to jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2CServerConnectionFactory.java diff --git a/jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java rename to jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java diff --git a/jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/RawHTTP2ServerConnectionFactory.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/RawHTTP2ServerConnectionFactory.java similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/RawHTTP2ServerConnectionFactory.java rename to jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/RawHTTP2ServerConnectionFactory.java diff --git a/jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerConnection.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerConnection.java similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerConnection.java rename to jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerConnection.java diff --git a/jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerSession.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerSession.java similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerSession.java rename to jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerSession.java diff --git a/jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpChannelOverHTTP2.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpChannelOverHTTP2.java similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpChannelOverHTTP2.java rename to jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpChannelOverHTTP2.java diff --git a/jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpStreamOverHTTP2.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpStreamOverHTTP2.java similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpStreamOverHTTP2.java rename to jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpStreamOverHTTP2.java diff --git a/jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpTransportOverHTTP2.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpTransportOverHTTP2.java similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpTransportOverHTTP2.java rename to jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpTransportOverHTTP2.java diff --git a/jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/ServerHTTP2StreamEndPoint.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/ServerHTTP2StreamEndPoint.java similarity index 100% rename from jetty-core/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/ServerHTTP2StreamEndPoint.java rename to jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/ServerHTTP2StreamEndPoint.java diff --git a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml index f90841cc4d9..f8acb496331 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.http2 - http2 + jetty-http2 12.0.0-SNAPSHOT @@ -92,17 +92,17 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client test org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test org.eclipse.jetty.http2 - http2-server + jetty-http2-server test diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/AbstractTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/AbstractTest.java index 45c4c95dabc..efc24f13ef5 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/AbstractTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/AbstractTest.java @@ -27,7 +27,7 @@ import org.eclipse.jetty.http2.FlowControlStrategy; import org.eclipse.jetty.http2.api.Session; import org.eclipse.jetty.http2.api.server.ServerSessionListener; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.http2.server.AbstractHTTP2ServerConnectionFactory; import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; import org.eclipse.jetty.http2.server.RawHTTP2ServerConnectionFactory; diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HttpClientTransportOverHTTP2Test.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HttpClientTransportOverHTTP2Test.java index 637c1bd3a0f..e6398dcfa2a 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HttpClientTransportOverHTTP2Test.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HttpClientTransportOverHTTP2Test.java @@ -51,9 +51,9 @@ import org.eclipse.jetty.http2.api.Session; import org.eclipse.jetty.http2.api.Stream; import org.eclipse.jetty.http2.api.server.ServerSessionListener; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; -import org.eclipse.jetty.http2.client.http.internal.HttpChannelOverHTTP2; -import org.eclipse.jetty.http2.client.http.internal.HttpConnectionOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.internal.HttpChannelOverHTTP2; +import org.eclipse.jetty.http2.client.transport.internal.HttpConnectionOverHTTP2; import org.eclipse.jetty.http2.frames.DataFrame; import org.eclipse.jetty.http2.frames.GoAwayFrame; import org.eclipse.jetty.http2.frames.HeadersFrame; diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/MaxConcurrentStreamsTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/MaxConcurrentStreamsTest.java index 45d36ace7ec..28452540b13 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/MaxConcurrentStreamsTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/MaxConcurrentStreamsTest.java @@ -47,7 +47,7 @@ import org.eclipse.jetty.http2.api.Session; import org.eclipse.jetty.http2.api.Stream; import org.eclipse.jetty.http2.api.server.ServerSessionListener; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.http2.frames.GoAwayFrame; import org.eclipse.jetty.http2.frames.HeadersFrame; import org.eclipse.jetty.http2.frames.PingFrame; diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/MultiplexedConnectionPoolTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/MultiplexedConnectionPoolTest.java index 305b6f933f8..96d8e252dcf 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/MultiplexedConnectionPoolTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/MultiplexedConnectionPoolTest.java @@ -29,7 +29,7 @@ import org.eclipse.jetty.client.MultiplexConnectionPool; import org.eclipse.jetty.client.api.Connection; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.io.Content; diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/PriorKnowledgeHTTP2OverTLSTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/PriorKnowledgeHTTP2OverTLSTest.java index 51632ed1248..bd168548211 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/PriorKnowledgeHTTP2OverTLSTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/PriorKnowledgeHTTP2OverTLSTest.java @@ -29,7 +29,7 @@ import org.eclipse.jetty.http2.HTTP2Cipher; import org.eclipse.jetty.http2.api.Session; import org.eclipse.jetty.http2.api.Stream; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.http2.frames.HeadersFrame; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; import org.eclipse.jetty.io.ClientConnector; diff --git a/jetty-core/jetty-http2/pom.xml b/jetty-core/jetty-http2/pom.xml index a4930dac5c6..4d6be40e93c 100644 --- a/jetty-core/jetty-http2/pom.xml +++ b/jetty-core/jetty-http2/pom.xml @@ -8,16 +8,16 @@ 4.0.0 org.eclipse.jetty.http2 - http2 + jetty-http2 pom Jetty Core :: HTTP2 - http2-client - http2-common - http2-hpack - http2-http-client-transport - http2-server + jetty-http2-client + jetty-http2-common + jetty-http2-hpack + jetty-http2-client-transport + jetty-http2-server jetty-http2-tests diff --git a/jetty-core/jetty-http3/http3-tests/pom.xml b/jetty-core/jetty-http3/http3-tests/pom.xml index c51aefa6371..3191baed7ff 100644 --- a/jetty-core/jetty-http3/http3-tests/pom.xml +++ b/jetty-core/jetty-http3/http3-tests/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test diff --git a/jetty-core/jetty-quic/quic-client/pom.xml b/jetty-core/jetty-quic/quic-client/pom.xml index bfb114e8633..fb5d2850419 100644 --- a/jetty-core/jetty-quic/quic-client/pom.xml +++ b/jetty-core/jetty-quic/quic-client/pom.xml @@ -34,12 +34,12 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test diff --git a/jetty-core/jetty-quic/quic-client/src/test/java/org/eclipse/jetty/quic/client/End2EndClientTest.java b/jetty-core/jetty-quic/quic-client/src/test/java/org/eclipse/jetty/quic/client/End2EndClientTest.java index 00a39c05d3b..f75403e40e4 100644 --- a/jetty-core/jetty-quic/quic-client/src/test/java/org/eclipse/jetty/quic/client/End2EndClientTest.java +++ b/jetty-core/jetty-quic/quic-client/src/test/java/org/eclipse/jetty/quic/client/End2EndClientTest.java @@ -22,7 +22,7 @@ import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic; import org.eclipse.jetty.client.http.HttpClientConnectionFactory; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.ClientConnectionFactoryOverHTTP2; +import org.eclipse.jetty.http2.client.transport.ClientConnectionFactoryOverHTTP2; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; import org.eclipse.jetty.io.ClientConnectionFactory; import org.eclipse.jetty.io.ClientConnector; diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml index 4d161172a71..39d76694f78 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml @@ -59,7 +59,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server org.eclipse.jetty diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml index 81a68ba9879..0e148ba6552 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml @@ -64,7 +64,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml index 912e29faba3..a11f9c04b04 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml @@ -346,11 +346,11 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server org.eclipse.jetty.http2 - http2-hpack + jetty-http2-hpack org.eclipse.jetty.ee10.osgi @@ -471,13 +471,13 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client ${project.version} test org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport ${project.version} test diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java index 98b7845a95e..a86e10796e2 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java @@ -24,7 +24,7 @@ import javax.inject.Inject; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.util.JavaVersion; import org.eclipse.jetty.util.ssl.SslContextFactory; @@ -78,8 +78,8 @@ public class TestJettyOSGiBootHTTP2Conscrypt options.add(mavenBundle().groupId("org.eclipse.jetty.demos").artifactId("demo-jsp-webapp").classifier("webbundle").versionAsInProject()); options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-conscrypt-client").versionAsInProject().start()); options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").versionAsInProject().start()); - options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-client").versionAsInProject().start()); - options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-http-client-transport").versionAsInProject().start()); + options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-client").versionAsInProject().start()); + options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-client-transport").versionAsInProject().start()); options.add(CoreOptions.cleanCaches(true)); return options.toArray(new Option[0]); @@ -100,9 +100,9 @@ public class TestJettyOSGiBootHTTP2Conscrypt res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-conscrypt-server").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-server").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-common").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-hpack").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-server").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-common").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-hpack").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-server").versionAsInProject().start()); return res; } diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootHTTP2JDK9.java b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootHTTP2JDK9.java index f601d495d35..5fcf26dcad8 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootHTTP2JDK9.java +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootHTTP2JDK9.java @@ -24,7 +24,7 @@ import javax.inject.Inject; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -75,8 +75,8 @@ public class TestJettyOSGiBootHTTP2JDK9 options.add(mavenBundle().groupId("org.eclipse.jetty.demos").artifactId("demo-jsp-webapp").classifier("webbundle").versionAsInProject()); options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-java-client").versionAsInProject().start()); options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").versionAsInProject().start()); - options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-client").versionAsInProject().start()); - options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-http-client-transport").versionAsInProject().start()); + options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-client").versionAsInProject().start()); + options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-client-transport").versionAsInProject().start()); options.add(CoreOptions.cleanCaches(true)); return options.toArray(new Option[0]); @@ -91,9 +91,9 @@ public class TestJettyOSGiBootHTTP2JDK9 res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-java-server").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-server").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-common").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-hpack").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-server").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-common").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-hpack").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-server").versionAsInProject().start()); return res; } diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/pom.xml index fcbccfda04c..f8cf7ae2df8 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/pom.xml @@ -90,12 +90,12 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/AsyncIOServletTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/AsyncIOServletTest.java index 4d67cda8244..0026758201c 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/AsyncIOServletTest.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/AsyncIOServletTest.java @@ -57,7 +57,7 @@ import org.eclipse.jetty.http.HttpHeaderValue; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http2.api.Session; -import org.eclipse.jetty.http2.client.http.internal.HttpConnectionOverHTTP2; +import org.eclipse.jetty.http2.client.transport.internal.HttpConnectionOverHTTP2; import org.eclipse.jetty.http2.internal.HTTP2Session; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EofException; diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/HttpChannelAssociationTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/HttpChannelAssociationTest.java index 935c08a6648..15d5e7e08c2 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/HttpChannelAssociationTest.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/HttpChannelAssociationTest.java @@ -34,9 +34,9 @@ import org.eclipse.jetty.fcgi.client.http.HttpClientTransportOverFCGI; import org.eclipse.jetty.fcgi.client.http.HttpConnectionOverFCGI; import org.eclipse.jetty.http2.api.Session; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; -import org.eclipse.jetty.http2.client.http.internal.HttpChannelOverHTTP2; -import org.eclipse.jetty.http2.client.http.internal.HttpConnectionOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.internal.HttpChannelOverHTTP2; +import org.eclipse.jetty.http2.client.transport.internal.HttpConnectionOverHTTP2; import org.eclipse.jetty.http3.client.HTTP3Client; import org.eclipse.jetty.http3.client.http.HttpClientTransportOverHTTP3; import org.eclipse.jetty.http3.client.http.internal.HttpChannelOverHTTP3; diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/HttpClientTransportDynamicTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/HttpClientTransportDynamicTest.java index bbd1d75cdf6..875eaf07eb6 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/HttpClientTransportDynamicTest.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/HttpClientTransportDynamicTest.java @@ -45,7 +45,7 @@ import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MimeTypes; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.ClientConnectionFactoryOverHTTP2; +import org.eclipse.jetty.http2.client.transport.ClientConnectionFactoryOverHTTP2; import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; import org.eclipse.jetty.io.ClientConnectionFactory; diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/ProxyWithDynamicTransportTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/ProxyWithDynamicTransportTest.java index 817d8fe2a27..e507416b633 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/ProxyWithDynamicTransportTest.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/ProxyWithDynamicTransportTest.java @@ -49,7 +49,7 @@ import org.eclipse.jetty.http2.HTTP2Cipher; import org.eclipse.jetty.http2.api.Session; import org.eclipse.jetty.http2.api.Stream; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.ClientConnectionFactoryOverHTTP2; +import org.eclipse.jetty.http2.client.transport.ClientConnectionFactoryOverHTTP2; import org.eclipse.jetty.http2.frames.DataFrame; import org.eclipse.jetty.http2.frames.HeadersFrame; import org.eclipse.jetty.http2.frames.ResetFrame; diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/ServerTimeoutsTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/ServerTimeoutsTest.java index d6dabd4144f..b2844b96fd8 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/ServerTimeoutsTest.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/ServerTimeoutsTest.java @@ -40,7 +40,7 @@ import org.eclipse.jetty.client.util.BufferingResponseListener; import org.eclipse.jetty.http.BadMessageException; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http2.FlowControlStrategy; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.logging.StacklessLogging; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Request; diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/TransportScenario.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/TransportScenario.java index 17d6b858898..41dcb490249 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/TransportScenario.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/TransportScenario.java @@ -34,7 +34,7 @@ import org.eclipse.jetty.fcgi.client.http.HttpClientTransportOverFCGI; import org.eclipse.jetty.fcgi.server.ServerFCGIConnectionFactory; import org.eclipse.jetty.http2.HTTP2Cipher; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.http2.server.AbstractHTTP2ServerConnectionFactory; import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml index 7b31ef15a3d..acccb246a8e 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml @@ -65,7 +65,7 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client jakarta.servlet @@ -94,7 +94,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml index 4c4b27ea917..4affc7cd339 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml @@ -118,7 +118,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server org.eclipse.jetty.ee10 diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml index d0709e6dcf4..24c44b390e1 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml @@ -42,7 +42,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test @@ -57,7 +57,7 @@ org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/WebSocketOverHTTP2Test.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/WebSocketOverHTTP2Test.java index 74224ecbb32..e6d7b48c5c7 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/WebSocketOverHTTP2Test.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/WebSocketOverHTTP2Test.java @@ -45,7 +45,7 @@ import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletConta import org.eclipse.jetty.ee10.websocket.server.internal.DelegatedServerUpgradeRequest; import org.eclipse.jetty.http2.HTTP2Cipher; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.ClientConnectionFactoryOverHTTP2; +import org.eclipse.jetty.http2.client.transport.ClientConnectionFactoryOverHTTP2; import org.eclipse.jetty.http2.internal.ErrorCode; import org.eclipse.jetty.http2.server.AbstractHTTP2ServerConnectionFactory; import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml index af8bc30d4f1..3c8fdaa2703 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml @@ -43,7 +43,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test @@ -58,7 +58,7 @@ org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml index 3e5da056286..fa1d5148bb7 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml @@ -63,7 +63,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server org.eclipse.jetty diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml index 9b4071a0960..d24c2c5c797 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml @@ -64,7 +64,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test diff --git a/jetty-ee9/jetty-ee9-fcgi-server-proxy/pom.xml b/jetty-ee9/jetty-ee9-fcgi-server-proxy/pom.xml index 900817ea12c..6780ccf2940 100644 --- a/jetty-ee9/jetty-ee9-fcgi-server-proxy/pom.xml +++ b/jetty-ee9/jetty-ee9-fcgi-server-proxy/pom.xml @@ -43,7 +43,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml index 26ab3b3253c..5f03478c32a 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml @@ -382,11 +382,11 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server org.eclipse.jetty.http2 - http2-hpack + jetty-http2-hpack org.eclipse.jetty.ee9.osgi @@ -507,13 +507,13 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client ${project.version} test org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport ${project.version} test diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java index f7f8ed3f912..dd6e26b84eb 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java @@ -24,7 +24,7 @@ import javax.inject.Inject; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.util.JavaVersion; import org.eclipse.jetty.util.ssl.SslContextFactory; @@ -75,8 +75,8 @@ public class TestJettyOSGiBootHTTP2Conscrypt options.add(mavenBundle().groupId("org.eclipse.jetty.demos").artifactId("demo-jsp-webapp").classifier("webbundle").versionAsInProject()); options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-conscrypt-client").versionAsInProject().start()); options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").versionAsInProject().start()); - options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-client").versionAsInProject().start()); - options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-http-client-transport").versionAsInProject().start()); + options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-client").versionAsInProject().start()); + options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-client-transport").versionAsInProject().start()); options.add(CoreOptions.cleanCaches(true)); return options.toArray(new Option[0]); @@ -93,9 +93,9 @@ public class TestJettyOSGiBootHTTP2Conscrypt res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-conscrypt-server").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-server").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-common").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-hpack").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-server").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-common").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-hpack").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-server").versionAsInProject().start()); return res; } diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootHTTP2JDK9.java b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootHTTP2JDK9.java index 4c63ac44cb2..a0d94c5990a 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootHTTP2JDK9.java +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootHTTP2JDK9.java @@ -24,7 +24,7 @@ import javax.inject.Inject; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -73,8 +73,8 @@ public class TestJettyOSGiBootHTTP2JDK9 options.add(mavenBundle().groupId("org.eclipse.jetty.demos").artifactId("demo-jsp-webapp").classifier("webbundle").versionAsInProject()); options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-java-client").versionAsInProject().start()); options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").versionAsInProject().start()); - options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-client").versionAsInProject().start()); - options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-http-client-transport").versionAsInProject().start()); + options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-client").versionAsInProject().start()); + options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-client-transport").versionAsInProject().start()); options.add(CoreOptions.cleanCaches(true)); return options.toArray(new Option[0]); @@ -89,9 +89,9 @@ public class TestJettyOSGiBootHTTP2JDK9 res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-java-server").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-server").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-common").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-hpack").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-server").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-common").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-hpack").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("jetty-http2-server").versionAsInProject().start()); return res; } diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/pom.xml index 22d9cab576f..9d5191c3f5f 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/pom.xml @@ -114,12 +114,12 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/AsyncIOServletTest.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/AsyncIOServletTest.java index 2d91c677966..0b051d87f5c 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/AsyncIOServletTest.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/AsyncIOServletTest.java @@ -57,7 +57,7 @@ import org.eclipse.jetty.http.HttpHeaderValue; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http2.api.Session; -import org.eclipse.jetty.http2.client.http.internal.HttpConnectionOverHTTP2; +import org.eclipse.jetty.http2.client.transport.internal.HttpConnectionOverHTTP2; import org.eclipse.jetty.http2.internal.HTTP2Session; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EofException; diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/HttpChannelAssociationTest.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/HttpChannelAssociationTest.java index b39d61cc822..4356f2590c1 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/HttpChannelAssociationTest.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/HttpChannelAssociationTest.java @@ -34,9 +34,9 @@ import org.eclipse.jetty.fcgi.client.http.HttpClientTransportOverFCGI; import org.eclipse.jetty.fcgi.client.http.HttpConnectionOverFCGI; import org.eclipse.jetty.http2.api.Session; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; -import org.eclipse.jetty.http2.client.http.internal.HttpChannelOverHTTP2; -import org.eclipse.jetty.http2.client.http.internal.HttpConnectionOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.internal.HttpChannelOverHTTP2; +import org.eclipse.jetty.http2.client.transport.internal.HttpConnectionOverHTTP2; import org.eclipse.jetty.http3.client.HTTP3Client; import org.eclipse.jetty.http3.client.http.HttpClientTransportOverHTTP3; import org.eclipse.jetty.http3.client.http.internal.HttpChannelOverHTTP3; diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/HttpClientTransportDynamicTest.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/HttpClientTransportDynamicTest.java index a2fd804677a..8d52c765143 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/HttpClientTransportDynamicTest.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/HttpClientTransportDynamicTest.java @@ -45,7 +45,7 @@ import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MimeTypes; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.ClientConnectionFactoryOverHTTP2; +import org.eclipse.jetty.http2.client.transport.ClientConnectionFactoryOverHTTP2; import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; import org.eclipse.jetty.io.ClientConnectionFactory; diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/ProxyWithDynamicTransportTest.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/ProxyWithDynamicTransportTest.java index 308145b90eb..f0e63a74101 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/ProxyWithDynamicTransportTest.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/ProxyWithDynamicTransportTest.java @@ -49,7 +49,7 @@ import org.eclipse.jetty.http2.HTTP2Cipher; import org.eclipse.jetty.http2.api.Session; import org.eclipse.jetty.http2.api.Stream; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.ClientConnectionFactoryOverHTTP2; +import org.eclipse.jetty.http2.client.transport.ClientConnectionFactoryOverHTTP2; import org.eclipse.jetty.http2.frames.DataFrame; import org.eclipse.jetty.http2.frames.HeadersFrame; import org.eclipse.jetty.http2.frames.ResetFrame; diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/ServerTimeoutsTest.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/ServerTimeoutsTest.java index d718045dbeb..01aaf5a8d47 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/ServerTimeoutsTest.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/ServerTimeoutsTest.java @@ -40,7 +40,7 @@ import org.eclipse.jetty.client.util.BufferingResponseListener; import org.eclipse.jetty.http.BadMessageException; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http2.FlowControlStrategy; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.logging.StacklessLogging; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Request; diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/TransportScenario.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/TransportScenario.java index 1a58c456718..f257e9a495e 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/TransportScenario.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/TransportScenario.java @@ -34,7 +34,7 @@ import org.eclipse.jetty.fcgi.client.http.HttpClientTransportOverFCGI; import org.eclipse.jetty.fcgi.server.ServerFCGIConnectionFactory; import org.eclipse.jetty.http2.HTTP2Cipher; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.http2.server.AbstractHTTP2ServerConnectionFactory; import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml index cb58b733992..df4dd0ab08c 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml @@ -65,7 +65,7 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client org.eclipse.jetty.toolchain @@ -94,7 +94,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml index 6cb4ff41442..4a34cb645d1 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml @@ -118,7 +118,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server org.eclipse.jetty.ee9 diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml index 212af38f288..c32d6cdeb81 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml @@ -44,7 +44,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test @@ -59,7 +59,7 @@ org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/WebSocketOverHTTP2Test.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/WebSocketOverHTTP2Test.java index 5fbda22559b..4a4e8c52b6e 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/WebSocketOverHTTP2Test.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/WebSocketOverHTTP2Test.java @@ -45,7 +45,7 @@ import org.eclipse.jetty.ee9.websocket.server.config.JettyWebSocketServletContai import org.eclipse.jetty.ee9.websocket.server.internal.DelegatedServerUpgradeRequest; import org.eclipse.jetty.http2.HTTP2Cipher; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.ClientConnectionFactoryOverHTTP2; +import org.eclipse.jetty.http2.client.transport.ClientConnectionFactoryOverHTTP2; import org.eclipse.jetty.http2.internal.ErrorCode; import org.eclipse.jetty.http2.server.AbstractHTTP2ServerConnectionFactory; import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index edbf304f20d..84c96b60459 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -194,7 +194,7 @@ org.eclipse.jetty.http2 - http2-hpack,http2-common,http2-server + jetty-http2-hpack,jetty-http2-common,jetty-http2-server jar ${assembly-directory}/lib/http2 @@ -207,7 +207,7 @@ org.eclipse.jetty.http2 - http2-hpack,http2-common,http2-server + jetty-http2-hpack,jetty-http2-common,jetty-http2-server jar sources ${source-assembly-directory}/lib/http2 @@ -562,7 +562,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server org.eclipse.jetty.http3 diff --git a/pom.xml b/pom.xml index 894e1aa99e0..e183966a6bb 100644 --- a/pom.xml +++ b/pom.xml @@ -1376,27 +1376,27 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client ${project.version} org.eclipse.jetty.http2 - http2-common + jetty-http2-common ${project.version} org.eclipse.jetty.http2 - http2-hpack + jetty-http2-hpack ${project.version} org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport ${project.version} org.eclipse.jetty.http2 - http2-server + jetty-http2-server ${project.version} diff --git a/tests/test-distribution/test-distribution-common/pom.xml b/tests/test-distribution/test-distribution-common/pom.xml index 79913b742c9..9127625d90c 100644 --- a/tests/test-distribution/test-distribution-common/pom.xml +++ b/tests/test-distribution/test-distribution-common/pom.xml @@ -79,12 +79,12 @@ org.eclipse.jetty.http2 - http2-client + jetty-http2-client test org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test diff --git a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index a46ebf062c4..61b79bfa53e 100644 --- a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -34,7 +34,7 @@ import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic; import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http2.client.HTTP2Client; -import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.toolchain.test.PathAssert; import org.eclipse.jetty.util.IO; diff --git a/tests/test-distribution/test-ee10-distribution/pom.xml b/tests/test-distribution/test-ee10-distribution/pom.xml index 2b69f32c32b..e00a75f1384 100644 --- a/tests/test-distribution/test-ee10-distribution/pom.xml +++ b/tests/test-distribution/test-ee10-distribution/pom.xml @@ -90,7 +90,7 @@ org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test diff --git a/tests/test-distribution/test-ee9-distribution/pom.xml b/tests/test-distribution/test-ee9-distribution/pom.xml index 3bde5857442..b02629dbda4 100644 --- a/tests/test-distribution/test-ee9-distribution/pom.xml +++ b/tests/test-distribution/test-ee9-distribution/pom.xml @@ -87,7 +87,7 @@ org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test