diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index fbf798d7bd5..5c59e5e68bf 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -198,23 +198,23 @@ org.eclipse.jetty.fcgi - fcgi-client + jetty-fcgi-client 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 - http3-server + jetty-http3-server org.eclipse.jetty.http3 - http3-http-client-transport + jetty-http3-client-transport org.eclipse.jetty 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/client/http3/client-http3.adoc b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/client/http3/client-http3.adoc index ff6d4a6dd4b..7059f546d01 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/programming-guide/client/http3/client-http3.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/client/http3/client-http3.adoc @@ -31,7 +31,7 @@ The Maven artifact coordinates for the HTTP/3 client library are the following: ---- org.eclipse.jetty.http3 - http3-client + jetty-http3-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/asciidoc/programming-guide/server/http3/server-http3.adoc b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/http3/server-http3.adoc index 5725db5038f..b6accc77e55 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/http3/server-http3.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/http3/server-http3.adoc @@ -29,7 +29,7 @@ The Maven artifact coordinates for the HTTP/3 client library are the following: ---- org.eclipse.jetty.http3 - http3-server + jetty-http3-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..24ab4cc57a9 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,10 +60,10 @@ 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.http3.client.transport.HttpClientTransportOverHTTP3; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.ClientConnectionFactory; import org.eclipse.jetty.io.ClientConnector; 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/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/HandlerDocs.java b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/HandlerDocs.java index 086e60395e3..e00c0f2c9fc 100644 --- a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/HandlerDocs.java +++ b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/HandlerDocs.java @@ -36,9 +36,6 @@ import org.eclipse.jetty.util.thread.SerializedInvoker; @SuppressWarnings("unused") public class HandlerDocs { - // TODO this class has been temporarily moved to jetty-core/jetty-demo - // move it back when documentation is re-enabled - public static class HelloHandler0 extends Handler.Abstract { @Override diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 0be1902e172..395418ad187 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -135,17 +135,7 @@ Eclipse Jetty API Doc - v${project.version} Eclipse Jetty API Doc - v${project.version} - org.eclipse.jetty.http3.client.http.internal; - org.eclipse.jetty.http3.client.internal; - org.eclipse.jetty.http3.internal; - org.eclipse.jetty.http3.internal.*; - org.eclipse.jetty.http3.qpack.internal; - org.eclipse.jetty.http3.qpack.internal.*; - org.eclipse.jetty.http3.server.internal; - org.eclipse.jetty.quic.common.internal; - org.eclipse.jetty.quic.quiche; - org.eclipse.jetty.quic.quiche.*; - org.eclipse.jetty.quic.server.internal; + org.eclipse.jetty.http3.client.transport.internal; org.eclipse.jetty.http3.client.internal; org.eclipse.jetty.http3.internal; org.eclipse.jetty.http3.internal.*; org.eclipse.jetty.http3.qpack.internal; org.eclipse.jetty.http3.qpack.internal.*; org.eclipse.jetty.http3.server.internal; org.eclipse.jetty.quic.common.internal; org.eclipse.jetty.quic.quiche; org.eclipse.jetty.quic.quiche.*; org.eclipse.jetty.quic.server.internal; @@ -217,12 +207,12 @@ org.eclipse.jetty.fcgi - fcgi-client + jetty-fcgi-client provided org.eclipse.jetty.fcgi - fcgi-server + jetty-fcgi-server provided @@ -237,32 +227,32 @@ 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 org.eclipse.jetty.http3 - http3-client + jetty-http3-client provided org.eclipse.jetty.http3 - http3-http-client-transport + jetty-http3-client-transport provided org.eclipse.jetty.http3 - http3-server + jetty-http3-server provided @@ -297,12 +287,12 @@ org.eclipse.jetty.quic - quic-client + jetty-quic-client provided org.eclipse.jetty.quic - quic-server + jetty-quic-server provided diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 153870013f4..36736735df0 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -117,12 +117,12 @@ org.eclipse.jetty.fcgi - fcgi-client + jetty-fcgi-client 12.0.0-SNAPSHOT org.eclipse.jetty.fcgi - fcgi-server + jetty-fcgi-server 12.0.0-SNAPSHOT @@ -149,52 +149,52 @@ 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 org.eclipse.jetty.http3 - http3-client + jetty-http3-client 12.0.0-SNAPSHOT org.eclipse.jetty.http3 - http3-common + jetty-http3-common 12.0.0-SNAPSHOT org.eclipse.jetty.http3 - http3-http-client-transport + jetty-http3-client-transport 12.0.0-SNAPSHOT org.eclipse.jetty.http3 - http3-qpack + jetty-http3-qpack 12.0.0-SNAPSHOT org.eclipse.jetty.http3 - http3-server + jetty-http3-server 12.0.0-SNAPSHOT @@ -294,27 +294,27 @@ org.eclipse.jetty.quic - quic-client + jetty-quic-client 12.0.0-SNAPSHOT org.eclipse.jetty.quic - quic-common + jetty-quic-common 12.0.0-SNAPSHOT org.eclipse.jetty.quic - quic-quiche-common + jetty-quic-quiche-common 12.0.0-SNAPSHOT org.eclipse.jetty.quic - quic-quiche-jna + jetty-quic-quiche-jna 12.0.0-SNAPSHOT org.eclipse.jetty.quic - quic-server + jetty-quic-server 12.0.0-SNAPSHOT @@ -449,17 +449,17 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common 12.0.0-SNAPSHOT org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client 12.0.0-SNAPSHOT org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server 12.0.0-SNAPSHOT @@ -480,7 +480,7 @@ org.eclipse.jetty.quic - quic-quiche-foreign-incubator + jetty-quic-quiche-foreign-incubator 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 e3bcd3847e1..9db0553e0d5 100644 --- a/jetty-core/jetty-bom/pom.xml +++ b/jetty-core/jetty-bom/pom.xml @@ -97,12 +97,12 @@ org.eclipse.jetty.fcgi - fcgi-client + jetty-fcgi-client 12.0.0-SNAPSHOT org.eclipse.jetty.fcgi - fcgi-server + jetty-fcgi-server 12.0.0-SNAPSHOT @@ -129,52 +129,52 @@ 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 org.eclipse.jetty.http3 - http3-client + jetty-http3-client 12.0.0-SNAPSHOT org.eclipse.jetty.http3 - http3-common + jetty-http3-common 12.0.0-SNAPSHOT org.eclipse.jetty.http3 - http3-http-client-transport + jetty-http3-client-transport 12.0.0-SNAPSHOT org.eclipse.jetty.http3 - http3-qpack + jetty-http3-qpack 12.0.0-SNAPSHOT org.eclipse.jetty.http3 - http3-server + jetty-http3-server 12.0.0-SNAPSHOT @@ -244,27 +244,27 @@ org.eclipse.jetty.quic - quic-client + jetty-quic-client 12.0.0-SNAPSHOT org.eclipse.jetty.quic - quic-common + jetty-quic-common 12.0.0-SNAPSHOT org.eclipse.jetty.quic - quic-quiche-common + jetty-quic-quiche-common 12.0.0-SNAPSHOT org.eclipse.jetty.quic - quic-quiche-jna + jetty-quic-quiche-jna 12.0.0-SNAPSHOT org.eclipse.jetty.quic - quic-server + jetty-quic-server 12.0.0-SNAPSHOT @@ -315,17 +315,17 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common 12.0.0-SNAPSHOT org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client 12.0.0-SNAPSHOT org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server 12.0.0-SNAPSHOT @@ -346,7 +346,7 @@ org.eclipse.jetty.quic - quic-quiche-foreign-incubator + jetty-quic-quiche-foreign-incubator 12.0.0-SNAPSHOT diff --git a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/core-demo.d/core-demo.xml b/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/core-demo.d/core-demo.xml deleted file mode 100644 index 38f939de794..00000000000 --- a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/core-demo.d/core-demo.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml b/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml new file mode 100644 index 00000000000..eae40efa386 --- /dev/null +++ b/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/jetty-core/jetty-demos/jetty-demo-handler/src/main/java/org/eclipse/jetty/core/demo/HandlerDocs.java b/jetty-core/jetty-demos/jetty-demo-handler/src/main/java/org/eclipse/jetty/core/demo/HandlerDocs.java deleted file mode 100644 index cf8a45ebba4..00000000000 --- a/jetty-core/jetty-demos/jetty-demo-handler/src/main/java/org/eclipse/jetty/core/demo/HandlerDocs.java +++ /dev/null @@ -1,208 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. -// -// This program and the accompanying materials are made available under the -// terms of the Eclipse Public License v. 2.0 which is available at -// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 -// which is available at https://www.apache.org/licenses/LICENSE-2.0. -// -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 -// ======================================================================== -// - -package org.eclipse.jetty.core.demo; - -import java.io.IOException; -import java.io.PrintStream; -import java.util.LinkedList; -import java.util.List; -import java.util.Queue; -import java.util.concurrent.Flow; - -import org.eclipse.jetty.http.HttpHeader; -import org.eclipse.jetty.http.MimeTypes; -import org.eclipse.jetty.io.Content; -import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.Response; -import org.eclipse.jetty.util.Blocker; -import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.thread.SerializedInvoker; - -public class HandlerDocs -{ - public static class HelloHandler0 extends Handler.Abstract - { - @Override - public Request.Processor handle(Request request) throws Exception - { - return (req, response, callback) -> - { - response.setStatus(200); - response.getHeaders().add(HttpHeader.CONTENT_TYPE, "text/plain"); - response.write(true, BufferUtil.toBuffer("Hello World\n"), callback); - }; - } - } - - public static class HelloHandler1 extends Handler.Abstract - { - @Override - public Request.Processor handle(Request request) throws Exception - { - return this::process; - } - - private void process(Request request, Response response, Callback callback) - { - response.setStatus(200); - response.getHeaders().add(HttpHeader.CONTENT_TYPE, "text/plain"); - Content.Sink.write(response, true, "Hello World", callback); - } - } - - public static class HelloHandler2 extends Handler.Processor.NonBlocking - { - @Override - public void process(Request request, Response response, Callback callback) - { - response.setStatus(200); - response.getHeaders().add(HttpHeader.CONTENT_TYPE, "text/plain"); - response.write(true, BufferUtil.toBuffer("Hello World\n"), callback); - } - } - - public static class HelloHandler3 extends Handler.Processor.Blocking - { - @Override - public void process(Request request, Response response, Callback callback) throws IOException - { - response.setStatus(200); - response.getHeaders().add(HttpHeader.CONTENT_TYPE, "text/plain"); - - try (Blocker.Callback blocker = Blocker.callback()) - { - response.write(false, BufferUtil.toBuffer("Hello "), blocker); - blocker.block(); - } - - Content.Sink.write(response, true, BufferUtil.toBuffer("World\n")); - - callback.succeeded(); - } - } - - public static class HelloHandler4 extends Handler.Processor.Blocking - { - @Override - public void process(Request request, Response response, Callback callback) throws IOException - { - response.setStatus(200); - response.getHeaders().add(HttpHeader.CONTENT_TYPE, "text/plain"); - try (PrintStream out = new PrintStream(Content.Sink.asOutputStream(response))) - { - out.print("Hello "); - out.println("World"); - callback.succeeded(); - } - catch (Throwable t) - { - callback.failed(t); - } - } - } - - public static class HelloHandler5 extends Handler.Processor.NonBlocking - { - @Override - public void process(Request request, Response response, Callback callback) throws IOException - { - response.setStatus(200); - response.getHeaders().add(HttpHeader.CONTENT_TYPE, "text/plain"); - new HelloWorldPublisher().subscribe(Content.Sink.asSubscriber(response, callback)); - } - } - - public static class HelloWorldPublisher implements Flow.Publisher - { - @Override - public void subscribe(Flow.Subscriber subscriber) - { - final SerializedInvoker invoker = new SerializedInvoker(); - final Queue chunks = new LinkedList<>(List.of( - Content.Chunk.from(BufferUtil.toBuffer("Hello "), false), - Content.Chunk.from(BufferUtil.toBuffer("World "), false), - Content.Chunk.EOF)); - - subscriber.onSubscribe(new Flow.Subscription() - { - @Override - public void request(long n) - { - while (n-- > 0 && !chunks.isEmpty()) - invoker.run(() -> subscriber.onNext(chunks.poll())); - } - - @Override - public void cancel() - { - subscriber.onNext(Content.Chunk.from(new IOException("Cancelled"))); - } - }); - } - } - - public static class EchoHandler extends Handler.Processor.NonBlocking - { - @Override - public void process(Request request, Response response, Callback callback) - { - response.setStatus(200); - response.getHeaders().put(HttpHeader.CONTENT_TYPE, request.getHeaders().get(HttpHeader.CONTENT_TYPE)); - - long contentLength = request.getHeaders().getLongField(HttpHeader.CONTENT_LENGTH); - if (contentLength >= 0) - response.getHeaders().putLongField(HttpHeader.CONTENT_LENGTH, contentLength); - - Content.copy(request, response, callback); - } - } - - public static class RootHandler extends Handler.Collection - { - @Override - public Request.Processor handle(Request request) throws Exception - { - final StringBuilder index = new StringBuilder(); - index.append("

Handler Demos

\n
    \n"); - - for (Handler handler : getHandlers()) - { - String name = handler.getClass().getSimpleName().replace("Handler", ""); - String path = "/" + name; - if (request.getPathInContext().equals(path)) - { - Request.Processor processor = handler.handle(request); - if (processor != null) - return processor; - } - index.append("
  • ") - .append(name) - .append("
    • \n"); - } - - index.append("
"); - return (req, res, callback) -> - { - res.setStatus(200); - res.getHeaders().add(HttpHeader.CONTENT_TYPE, MimeTypes.Type.TEXT_HTML_UTF_8.asString()); - Content.Sink.write(res, true, index.toString(), callback); - }; - } - } -} diff --git a/jetty-core/jetty-demos/jetty-demo-handler/src/main/java/org/eclipse/jetty/demo/HelloHandler.java b/jetty-core/jetty-demos/jetty-demo-handler/src/main/java/org/eclipse/jetty/demo/HelloHandler.java new file mode 100644 index 00000000000..9e132918ba8 --- /dev/null +++ b/jetty-core/jetty-demos/jetty-demo-handler/src/main/java/org/eclipse/jetty/demo/HelloHandler.java @@ -0,0 +1,33 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.demo; + +import org.eclipse.jetty.http.HttpHeader; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.util.BufferUtil; + +public class HelloHandler extends Handler.Abstract +{ + @Override + public Request.Processor handle(Request req) + { + return (request, response, callback) -> + { + response.setStatus(200); + response.getHeaders().add(HttpHeader.CONTENT_TYPE, "text/plain"); + response.write(true, BufferUtil.toBuffer("Hello World\n"), callback); + }; + } +} diff --git a/jetty-core/jetty-fcgi/fcgi-client/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml similarity index 94% rename from jetty-core/jetty-fcgi/fcgi-client/pom.xml rename to jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml index 9803acffe6d..ecf4cc72178 100644 --- a/jetty-core/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.fcgi - fcgi + jetty-fcgi 12.0.0-SNAPSHOT 4.0.0 - fcgi-client + jetty-fcgi-client Jetty Core :: FastCGI :: Client diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/module-info.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/module-info.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/module-info.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/FCGI.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/FCGI.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/FCGI.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/FCGI.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpChannelOverFCGI.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpChannelOverFCGI.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpChannelOverFCGI.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpChannelOverFCGI.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpReceiverOverFCGI.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpReceiverOverFCGI.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpReceiverOverFCGI.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpReceiverOverFCGI.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpSenderOverFCGI.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpSenderOverFCGI.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpSenderOverFCGI.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpSenderOverFCGI.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java diff --git a/jetty-core/jetty-fcgi/fcgi-client/src/test/resources/jetty-logging.properties b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-client/src/test/resources/jetty-logging.properties rename to jetty-core/jetty-fcgi/jetty-fcgi-client/src/test/resources/jetty-logging.properties diff --git a/jetty-core/jetty-fcgi/fcgi-server/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml similarity index 91% rename from jetty-core/jetty-fcgi/fcgi-server/pom.xml rename to jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml index afd60d84c54..95b20fdb808 100644 --- a/jetty-core/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.fcgi - fcgi + jetty-fcgi 12.0.0-SNAPSHOT 4.0.0 - fcgi-server + jetty-fcgi-server Jetty Core :: FastCGI :: Server @@ -26,7 +26,7 @@ --> org.eclipse.jetty.fcgi - fcgi-client + jetty-fcgi-client org.eclipse.jetty @@ -39,7 +39,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test diff --git a/jetty-core/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod b/jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/config/modules/fcgi.mod similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod rename to jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/config/modules/fcgi.mod diff --git a/jetty-core/jetty-fcgi/fcgi-server/src/main/java/module-info.java b/jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-server/src/main/java/module-info.java rename to jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/module-info.java diff --git a/jetty-core/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/ServerFCGIConnectionFactory.java b/jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/ServerFCGIConnectionFactory.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/ServerFCGIConnectionFactory.java rename to jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/ServerFCGIConnectionFactory.java diff --git a/jetty-core/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/HttpStreamOverFCGI.java b/jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/HttpStreamOverFCGI.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/HttpStreamOverFCGI.java rename to jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/HttpStreamOverFCGI.java diff --git a/jetty-core/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java b/jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java rename to jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java diff --git a/jetty-core/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java b/jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java rename to jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java diff --git a/jetty-core/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/ExternalFastCGIServerTest.java b/jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/ExternalFastCGIServerTest.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/ExternalFastCGIServerTest.java rename to jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/ExternalFastCGIServerTest.java diff --git a/jetty-core/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java b/jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java rename to jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java diff --git a/jetty-core/jetty-fcgi/fcgi-server/src/test/resources/jetty-logging.properties b/jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-server/src/test/resources/jetty-logging.properties rename to jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/resources/jetty-logging.properties diff --git a/jetty-core/jetty-fcgi/fcgi-server/src/test/resources/keystore.p12 b/jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/resources/keystore.p12 similarity index 100% rename from jetty-core/jetty-fcgi/fcgi-server/src/test/resources/keystore.p12 rename to jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/resources/keystore.p12 diff --git a/jetty-core/jetty-fcgi/pom.xml b/jetty-core/jetty-fcgi/pom.xml index 4e8997767d1..f12257023e2 100644 --- a/jetty-core/jetty-fcgi/pom.xml +++ b/jetty-core/jetty-fcgi/pom.xml @@ -8,13 +8,13 @@ 4.0.0 org.eclipse.jetty.fcgi - fcgi + jetty-fcgi pom - Jetty Core :: FastCGI :: Parent + Jetty Core :: FastCGI - fcgi-client - fcgi-server + jetty-fcgi-client + jetty-fcgi-server 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-http-client-transport/pom.xml b/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml similarity index 82% rename from jetty-core/jetty-http3/http3-http-client-transport/pom.xml rename to jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml index 84098a9f96c..1bdedf743f4 100644 --- a/jetty-core/jetty-http3/http3-http-client-transport/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.http3 - http3 + jetty-http3 12.0.0-SNAPSHOT 4.0.0 - http3-http-client-transport + jetty-http3-client-transport Jetty Core :: HTTP3 :: HTTP Client Transport @@ -17,7 +17,7 @@ org.eclipse.jetty.http3 - http3-client + jetty-http3-client org.eclipse.jetty @@ -26,7 +26,7 @@ org.eclipse.jetty.http3 - http3-server + jetty-http3-server test diff --git a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/module-info.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/module-info.java similarity index 93% rename from jetty-core/jetty-http3/http3-http-client-transport/src/main/java/module-info.java rename to jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/module-info.java index ddc751ef04b..b1e3a4a28ab 100644 --- a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/module-info.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/module-info.java @@ -18,5 +18,5 @@ module org.eclipse.jetty.http3.http.client.transport requires transitive org.eclipse.jetty.client; requires transitive org.eclipse.jetty.http3.client; - exports org.eclipse.jetty.http3.client.http; + exports org.eclipse.jetty.http3.client.transport; } diff --git a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/ClientConnectionFactoryOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/ClientConnectionFactoryOverHTTP3.java similarity index 95% rename from jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/ClientConnectionFactoryOverHTTP3.java rename to jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/ClientConnectionFactoryOverHTTP3.java index a6599361059..44669a97701 100644 --- a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/ClientConnectionFactoryOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/ClientConnectionFactoryOverHTTP3.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.client.http; +package org.eclipse.jetty.http3.client.transport; import java.util.List; import java.util.Map; @@ -20,7 +20,7 @@ import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic; import org.eclipse.jetty.client.http.HttpClientConnectionFactory; import org.eclipse.jetty.http3.client.HTTP3Client; import org.eclipse.jetty.http3.client.HTTP3ClientConnectionFactory; -import org.eclipse.jetty.http3.client.http.internal.SessionClientListener; +import org.eclipse.jetty.http3.client.transport.internal.SessionClientListener; import org.eclipse.jetty.io.ClientConnectionFactory; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.quic.common.ProtocolSession; diff --git a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/HttpClientTransportOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/HttpClientTransportOverHTTP3.java similarity index 96% rename from jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/HttpClientTransportOverHTTP3.java rename to jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/HttpClientTransportOverHTTP3.java index b75a61a9183..cf128a44560 100644 --- a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/HttpClientTransportOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/HttpClientTransportOverHTTP3.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.client.http; +package org.eclipse.jetty.http3.client.transport; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -31,9 +31,9 @@ import org.eclipse.jetty.client.Origin; import org.eclipse.jetty.http3.HTTP3Configuration; import org.eclipse.jetty.http3.client.HTTP3Client; import org.eclipse.jetty.http3.client.HTTP3ClientConnectionFactory; -import org.eclipse.jetty.http3.client.http.internal.HttpConnectionOverHTTP3; -import org.eclipse.jetty.http3.client.http.internal.SessionClientListener; import org.eclipse.jetty.http3.client.internal.HTTP3SessionClient; +import org.eclipse.jetty.http3.client.transport.internal.HttpConnectionOverHTTP3; +import org.eclipse.jetty.http3.client.transport.internal.SessionClientListener; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; diff --git a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/HttpChannelOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpChannelOverHTTP3.java similarity index 98% rename from jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/HttpChannelOverHTTP3.java rename to jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpChannelOverHTTP3.java index 7ec91645258..e090c33936e 100644 --- a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/HttpChannelOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpChannelOverHTTP3.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.client.http.internal; +package org.eclipse.jetty.http3.client.transport.internal; import org.eclipse.jetty.client.HttpChannel; import org.eclipse.jetty.client.HttpDestination; diff --git a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/HttpConnectionOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpConnectionOverHTTP3.java similarity index 98% rename from jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/HttpConnectionOverHTTP3.java rename to jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpConnectionOverHTTP3.java index 16c76f961eb..25476345245 100644 --- a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/HttpConnectionOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpConnectionOverHTTP3.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.client.http.internal; +package org.eclipse.jetty.http3.client.transport.internal; import java.nio.channels.AsynchronousCloseException; import java.util.Iterator; diff --git a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/HttpReceiverOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpReceiverOverHTTP3.java similarity index 98% rename from jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/HttpReceiverOverHTTP3.java rename to jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpReceiverOverHTTP3.java index 867100b3768..67b6ee598b3 100644 --- a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/HttpReceiverOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpReceiverOverHTTP3.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.client.http.internal; +package org.eclipse.jetty.http3.client.transport.internal; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/HttpSenderOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpSenderOverHTTP3.java similarity index 99% rename from jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/HttpSenderOverHTTP3.java rename to jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpSenderOverHTTP3.java index 62fd1826e44..a8289342f95 100644 --- a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/HttpSenderOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpSenderOverHTTP3.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.client.http.internal; +package org.eclipse.jetty.http3.client.transport.internal; import java.nio.ByteBuffer; import java.util.concurrent.CompletableFuture; diff --git a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/SessionClientListener.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/SessionClientListener.java similarity index 98% rename from jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/SessionClientListener.java rename to jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/SessionClientListener.java index 9ed9f87a50b..c42bda148de 100644 --- a/jetty-core/jetty-http3/http3-http-client-transport/src/main/java/org/eclipse/jetty/http3/client/http/internal/SessionClientListener.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/SessionClientListener.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.client.http.internal; +package org.eclipse.jetty.http3.client.transport.internal; import java.nio.channels.ClosedChannelException; import java.util.Map; diff --git a/jetty-core/jetty-http3/http3-client/pom.xml b/jetty-core/jetty-http3/jetty-http3-client/pom.xml similarity index 84% rename from jetty-core/jetty-http3/http3-client/pom.xml rename to jetty-core/jetty-http3/jetty-http3-client/pom.xml index 0888f2154e5..c5f230ebb6d 100644 --- a/jetty-core/jetty-http3/http3-client/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-client/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.http3 - http3 + jetty-http3 12.0.0-SNAPSHOT 4.0.0 - http3-client + jetty-http3-client Jetty Core :: HTTP3 :: Client @@ -17,11 +17,11 @@ org.eclipse.jetty.http3 - http3-common + jetty-http3-common org.eclipse.jetty.quic - quic-client + jetty-quic-client org.eclipse.jetty diff --git a/jetty-core/jetty-http3/http3-client/src/main/java/module-info.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-http3/http3-client/src/main/java/module-info.java rename to jetty-core/jetty-http3/jetty-http3-client/src/main/java/module-info.java diff --git a/jetty-core/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3Client.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3Client.java similarity index 100% rename from jetty-core/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3Client.java rename to jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3Client.java diff --git a/jetty-core/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3ClientConnectionFactory.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3ClientConnectionFactory.java similarity index 100% rename from jetty-core/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3ClientConnectionFactory.java rename to jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3ClientConnectionFactory.java diff --git a/jetty-core/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3Session.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3Session.java similarity index 100% rename from jetty-core/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3Session.java rename to jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3Session.java diff --git a/jetty-core/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3StreamConnection.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3StreamConnection.java similarity index 100% rename from jetty-core/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3StreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3StreamConnection.java diff --git a/jetty-core/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3SessionClient.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3SessionClient.java similarity index 100% rename from jetty-core/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3SessionClient.java rename to jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3SessionClient.java diff --git a/jetty-core/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3StreamClient.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3StreamClient.java similarity index 100% rename from jetty-core/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3StreamClient.java rename to jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3StreamClient.java diff --git a/jetty-core/jetty-http3/http3-common/pom.xml b/jetty-core/jetty-http3/jetty-http3-common/pom.xml similarity index 86% rename from jetty-core/jetty-http3/http3-common/pom.xml rename to jetty-core/jetty-http3/jetty-http3-common/pom.xml index 9d09c2feef8..6b970df5e79 100644 --- a/jetty-core/jetty-http3/http3-common/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-common/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.http3 - http3 + jetty-http3 12.0.0-SNAPSHOT 4.0.0 - http3-common + jetty-http3-common Jetty Core :: HTTP3 :: Common @@ -21,11 +21,11 @@ org.eclipse.jetty.http3 - http3-qpack + jetty-http3-qpack org.eclipse.jetty.quic - quic-common + jetty-quic-common org.eclipse.jetty diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/module-info.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/module-info.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/module-info.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3Configuration.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3Configuration.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3Configuration.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3Configuration.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/api/Session.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/api/Session.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/api/Session.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/api/Session.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/api/Stream.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/api/Stream.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/api/Stream.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/api/Stream.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/frames/DataFrame.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/frames/DataFrame.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/frames/DataFrame.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/frames/DataFrame.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/frames/Frame.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/frames/Frame.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/frames/Frame.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/frames/Frame.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/frames/FrameType.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/frames/FrameType.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/frames/FrameType.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/frames/FrameType.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/frames/GoAwayFrame.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/frames/GoAwayFrame.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/frames/GoAwayFrame.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/frames/GoAwayFrame.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/frames/HeadersFrame.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/frames/HeadersFrame.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/frames/HeadersFrame.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/frames/HeadersFrame.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/frames/SettingsFrame.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/frames/SettingsFrame.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/frames/SettingsFrame.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/frames/SettingsFrame.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlFlusher.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlFlusher.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlFlusher.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlFlusher.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlStreamConnection.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlStreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlStreamConnection.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/DecoderStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/DecoderStreamConnection.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/DecoderStreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/DecoderStreamConnection.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/EncoderStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/EncoderStreamConnection.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/EncoderStreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/EncoderStreamConnection.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3ErrorCode.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3ErrorCode.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3ErrorCode.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3ErrorCode.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Session.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Session.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Session.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Session.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Stream.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Stream.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Stream.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Stream.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3StreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3StreamConnection.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3StreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3StreamConnection.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionFlusher.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionFlusher.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionFlusher.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionFlusher.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionHandler.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionHandler.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionHandler.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionHandler.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionStreamConnection.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionStreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionStreamConnection.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/MessageFlusher.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/MessageFlusher.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/MessageFlusher.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/MessageFlusher.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/UnidirectionalStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/UnidirectionalStreamConnection.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/UnidirectionalStreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/UnidirectionalStreamConnection.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/VarLenInt.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/VarLenInt.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/VarLenInt.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/VarLenInt.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/CancelPushGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/CancelPushGenerator.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/CancelPushGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/CancelPushGenerator.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/ControlGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/ControlGenerator.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/ControlGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/ControlGenerator.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/DataGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/DataGenerator.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/DataGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/DataGenerator.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/FrameGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/FrameGenerator.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/FrameGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/FrameGenerator.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/GoAwayGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/GoAwayGenerator.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/GoAwayGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/GoAwayGenerator.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/HeadersGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/HeadersGenerator.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/HeadersGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/HeadersGenerator.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MaxPushIdGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MaxPushIdGenerator.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MaxPushIdGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MaxPushIdGenerator.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MessageGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MessageGenerator.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MessageGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MessageGenerator.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/PushPromiseGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/PushPromiseGenerator.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/PushPromiseGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/PushPromiseGenerator.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/SettingsGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/SettingsGenerator.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/SettingsGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/SettingsGenerator.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/BodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/BodyParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/BodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/BodyParser.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/CancelPushBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/CancelPushBodyParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/CancelPushBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/CancelPushBodyParser.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ControlParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ControlParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ControlParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ControlParser.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/DataBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/DataBodyParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/DataBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/DataBodyParser.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/GoAwayBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/GoAwayBodyParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/GoAwayBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/GoAwayBodyParser.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeaderParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeaderParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeaderParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeaderParser.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeadersBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeadersBodyParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeadersBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeadersBodyParser.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MaxPushIdBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MaxPushIdBodyParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MaxPushIdBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MaxPushIdBodyParser.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MessageParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MessageParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MessageParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MessageParser.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ParserListener.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ParserListener.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ParserListener.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ParserListener.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/PushPromiseBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/PushPromiseBodyParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/PushPromiseBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/PushPromiseBodyParser.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/SettingsBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/SettingsBodyParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/SettingsBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/SettingsBodyParser.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/UnknownBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/UnknownBodyParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/UnknownBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/UnknownBodyParser.java diff --git a/jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/server-QUIC-H3.puml b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/server-QUIC-H3.puml similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/server-QUIC-H3.puml rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/server-QUIC-H3.puml diff --git a/jetty-core/jetty-http3/http3-common/src/test/java/org/eclipse/jetty/http3/VarLenIntTest.java b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/VarLenIntTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/test/java/org/eclipse/jetty/http3/VarLenIntTest.java rename to jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/VarLenIntTest.java diff --git a/jetty-core/jetty-http3/http3-common/src/test/java/org/eclipse/jetty/http3/internal/DataGenerateParseTest.java b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/DataGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/test/java/org/eclipse/jetty/http3/internal/DataGenerateParseTest.java rename to jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/DataGenerateParseTest.java diff --git a/jetty-core/jetty-http3/http3-common/src/test/java/org/eclipse/jetty/http3/internal/GoAwayGenerateParseTest.java b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/GoAwayGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/test/java/org/eclipse/jetty/http3/internal/GoAwayGenerateParseTest.java rename to jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/GoAwayGenerateParseTest.java diff --git a/jetty-core/jetty-http3/http3-common/src/test/java/org/eclipse/jetty/http3/internal/HeadersGenerateParseTest.java b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/HeadersGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/test/java/org/eclipse/jetty/http3/internal/HeadersGenerateParseTest.java rename to jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/HeadersGenerateParseTest.java diff --git a/jetty-core/jetty-http3/http3-common/src/test/java/org/eclipse/jetty/http3/internal/SettingsGenerateParseTest.java b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/SettingsGenerateParseTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-common/src/test/java/org/eclipse/jetty/http3/internal/SettingsGenerateParseTest.java rename to jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/SettingsGenerateParseTest.java diff --git a/jetty-core/jetty-http3/http3-qpack/pom.xml b/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml similarity index 96% rename from jetty-core/jetty-http3/http3-qpack/pom.xml rename to jetty-core/jetty-http3/jetty-http3-qpack/pom.xml index b0fec3ef58f..a4b06077101 100644 --- a/jetty-core/jetty-http3/http3-qpack/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.http3 - http3 + jetty-http3 12.0.0-SNAPSHOT 4.0.0 - http3-qpack + jetty-http3-qpack Jetty Core :: HTTP3 :: QPACK diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/module-info.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/module-info.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/module-info.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/Instruction.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/Instruction.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/Instruction.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/Instruction.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackDecoder.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackDecoder.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackDecoder.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackDecoder.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackEncoder.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackEncoder.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackEncoder.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackEncoder.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackException.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackException.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackException.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackException.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackFieldPreEncoder.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackFieldPreEncoder.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackFieldPreEncoder.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackFieldPreEncoder.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/EncodableEntry.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/EncodableEntry.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/EncodableEntry.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/EncodableEntry.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/QpackContext.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/QpackContext.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/QpackContext.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/QpackContext.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/StreamInfo.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/StreamInfo.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/StreamInfo.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/StreamInfo.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/DuplicateInstruction.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/DuplicateInstruction.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/DuplicateInstruction.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/DuplicateInstruction.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/IndexedNameEntryInstruction.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/IndexedNameEntryInstruction.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/IndexedNameEntryInstruction.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/IndexedNameEntryInstruction.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/InsertCountIncrementInstruction.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/InsertCountIncrementInstruction.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/InsertCountIncrementInstruction.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/InsertCountIncrementInstruction.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/LiteralNameEntryInstruction.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/LiteralNameEntryInstruction.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/LiteralNameEntryInstruction.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/LiteralNameEntryInstruction.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/SectionAcknowledgmentInstruction.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/SectionAcknowledgmentInstruction.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/SectionAcknowledgmentInstruction.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/SectionAcknowledgmentInstruction.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/SetCapacityInstruction.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/SetCapacityInstruction.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/SetCapacityInstruction.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/SetCapacityInstruction.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/StreamCancellationInstruction.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/StreamCancellationInstruction.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/StreamCancellationInstruction.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/instruction/StreamCancellationInstruction.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/AuthorityHttpField.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/AuthorityHttpField.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/AuthorityHttpField.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/AuthorityHttpField.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/Http3Fields.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/Http3Fields.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/Http3Fields.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/Http3Fields.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/MetaDataBuilder.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/MetaDataBuilder.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/MetaDataBuilder.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/MetaDataBuilder.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/StaticTableHttpField.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/StaticTableHttpField.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/StaticTableHttpField.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/metadata/StaticTableHttpField.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/DecoderInstructionParser.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/DecoderInstructionParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/DecoderInstructionParser.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/DecoderInstructionParser.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/EncodedFieldSection.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/EncodedFieldSection.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/EncodedFieldSection.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/EncodedFieldSection.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/EncoderInstructionParser.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/EncoderInstructionParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/EncoderInstructionParser.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/EncoderInstructionParser.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/table/DynamicTable.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/table/DynamicTable.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/table/DynamicTable.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/table/DynamicTable.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/table/Entry.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/table/Entry.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/table/Entry.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/table/Entry.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/table/StaticTable.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/table/StaticTable.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/table/StaticTable.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/table/StaticTable.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/EncodingException.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/EncodingException.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/EncodingException.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/EncodingException.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/HuffmanDecoder.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/HuffmanDecoder.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/HuffmanDecoder.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/HuffmanDecoder.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/HuffmanEncoder.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/HuffmanEncoder.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/HuffmanEncoder.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/HuffmanEncoder.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/NBitIntegerEncoder.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/NBitIntegerEncoder.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/NBitIntegerEncoder.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/NBitIntegerEncoder.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/NBitIntegerParser.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/NBitIntegerParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/NBitIntegerParser.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/NBitIntegerParser.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/NBitStringParser.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/NBitStringParser.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/NBitStringParser.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/util/NBitStringParser.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/main/resources/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/resources/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/main/resources/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder rename to jetty-core/jetty-http3/jetty-http3-qpack/src/main/resources/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/BlockedStreamsTest.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/BlockedStreamsTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/BlockedStreamsTest.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/BlockedStreamsTest.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/DecoderInstructionParserTest.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/DecoderInstructionParserTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/DecoderInstructionParserTest.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/DecoderInstructionParserTest.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/DecoderParserDebugHandler.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/DecoderParserDebugHandler.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/DecoderParserDebugHandler.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/DecoderParserDebugHandler.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EncodeDecodeTest.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EncodeDecodeTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EncodeDecodeTest.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EncodeDecodeTest.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EncoderInstructionParserTest.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EncoderInstructionParserTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EncoderInstructionParserTest.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EncoderInstructionParserTest.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EncoderParserDebugHandler.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EncoderParserDebugHandler.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EncoderParserDebugHandler.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EncoderParserDebugHandler.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EvictionTest.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EvictionTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EvictionTest.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EvictionTest.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/HuffmanTest.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/HuffmanTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/HuffmanTest.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/HuffmanTest.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/InstructionGeneratorTest.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/InstructionGeneratorTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/InstructionGeneratorTest.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/InstructionGeneratorTest.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/NBitIntegerParserTest.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/NBitIntegerParserTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/NBitIntegerParserTest.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/NBitIntegerParserTest.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/NBitIntegerTest.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/NBitIntegerTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/NBitIntegerTest.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/NBitIntegerTest.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/PreEncodedFieldTest.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/PreEncodedFieldTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/PreEncodedFieldTest.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/PreEncodedFieldTest.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/QpackTestUtil.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/QpackTestUtil.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/QpackTestUtil.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/QpackTestUtil.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/SectionAcknowledgmentTest.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/SectionAcknowledgmentTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/SectionAcknowledgmentTest.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/SectionAcknowledgmentTest.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/TestDecoderHandler.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/TestDecoderHandler.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/TestDecoderHandler.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/TestDecoderHandler.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/TestEncoderHandler.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/TestEncoderHandler.java similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/TestEncoderHandler.java rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/TestEncoderHandler.java diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_00.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_00.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_00.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_00.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_01.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_01.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_01.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_01.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_02.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_02.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_02.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_02.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_03.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_03.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_03.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_03.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_04.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_04.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_04.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_04.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_05.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_05.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_05.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_05.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_06.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_06.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_06.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_06.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_07.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_07.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_07.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_07.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_08.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_08.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_08.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_08.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_09.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_09.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_09.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_09.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_10.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_10.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_10.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_10.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_11.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_11.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_11.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_11.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_12.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_12.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_12.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_12.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_13.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_13.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_13.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_13.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_14.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_14.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_14.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_14.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_15.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_15.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_15.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_15.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_16.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_16.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_16.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_16.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_17.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_17.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_17.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_17.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_18.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_18.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_18.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_18.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_19.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_19.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_19.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_19.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_20.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_20.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_20.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_20.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_21.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_21.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_21.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_21.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_22.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_22.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_22.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_22.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_23.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_23.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_23.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_23.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_24.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_24.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_24.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_24.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_25.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_25.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_25.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_25.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_26.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_26.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_26.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_26.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_27.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_27.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_27.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_27.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_28.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_28.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_28.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_28.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_29.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_29.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_29.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_29.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_30.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_30.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_30.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_30.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_31.json b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_31.json similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/data/story_31.json rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/data/story_31.json diff --git a/jetty-core/jetty-http3/http3-qpack/src/test/resources/jetty-logging.properties b/jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-core/jetty-http3/http3-qpack/src/test/resources/jetty-logging.properties rename to jetty-core/jetty-http3/jetty-http3-qpack/src/test/resources/jetty-logging.properties diff --git a/jetty-core/jetty-http3/http3-server/pom.xml b/jetty-core/jetty-http3/jetty-http3-server/pom.xml similarity index 82% rename from jetty-core/jetty-http3/http3-server/pom.xml rename to jetty-core/jetty-http3/jetty-http3-server/pom.xml index 2b33c2189e4..a81dbbaeb5a 100644 --- a/jetty-core/jetty-http3/http3-server/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-server/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.http3 - http3 + jetty-http3 12.0.0-SNAPSHOT 4.0.0 - http3-server + jetty-http3-server Jetty Core :: HTTP3 :: Server @@ -21,11 +21,11 @@ org.eclipse.jetty.http3 - http3-common + jetty-http3-common org.eclipse.jetty.quic - quic-server + jetty-quic-server diff --git a/jetty-core/jetty-http3/http3-server/src/main/config/etc/jetty-http3.xml b/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/config/etc/jetty-http3.xml rename to jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml diff --git a/jetty-core/jetty-http3/http3-server/src/main/config/modules/http3.mod b/jetty-core/jetty-http3/jetty-http3-server/src/main/config/modules/http3.mod similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/config/modules/http3.mod rename to jetty-core/jetty-http3/jetty-http3-server/src/main/config/modules/http3.mod diff --git a/jetty-core/jetty-http3/http3-server/src/main/config/modules/jna.mod b/jetty-core/jetty-http3/jetty-http3-server/src/main/config/modules/jna.mod similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/config/modules/jna.mod rename to jetty-core/jetty-http3/jetty-http3-server/src/main/config/modules/jna.mod diff --git a/jetty-core/jetty-http3/http3-server/src/main/config/modules/quiche.mod b/jetty-core/jetty-http3/jetty-http3-server/src/main/config/modules/quiche.mod similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/config/modules/quiche.mod rename to jetty-core/jetty-http3/jetty-http3-server/src/main/config/modules/quiche.mod diff --git a/jetty-core/jetty-http3/http3-server/src/main/java/module-info.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/java/module-info.java rename to jetty-core/jetty-http3/jetty-http3-server/src/main/java/module-info.java diff --git a/jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/AbstractHTTP3ServerConnectionFactory.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/AbstractHTTP3ServerConnectionFactory.java similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/AbstractHTTP3ServerConnectionFactory.java rename to jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/AbstractHTTP3ServerConnectionFactory.java diff --git a/jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/HTTP3ServerConnectionFactory.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/HTTP3ServerConnectionFactory.java similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/HTTP3ServerConnectionFactory.java rename to jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/HTTP3ServerConnectionFactory.java diff --git a/jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/HTTP3ServerConnector.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/HTTP3ServerConnector.java similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/HTTP3ServerConnector.java rename to jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/HTTP3ServerConnector.java diff --git a/jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/RawHTTP3ServerConnectionFactory.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/RawHTTP3ServerConnectionFactory.java similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/RawHTTP3ServerConnectionFactory.java rename to jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/RawHTTP3ServerConnectionFactory.java diff --git a/jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3SessionServer.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3SessionServer.java similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3SessionServer.java rename to jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3SessionServer.java diff --git a/jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3StreamServer.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3StreamServer.java similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3StreamServer.java rename to jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3StreamServer.java diff --git a/jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java rename to jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java diff --git a/jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3Session.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3Session.java similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3Session.java rename to jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3Session.java diff --git a/jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3StreamConnection.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3StreamConnection.java similarity index 100% rename from jetty-core/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3StreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3StreamConnection.java diff --git a/jetty-core/jetty-http3/http3-tests/pom.xml b/jetty-core/jetty-http3/jetty-http3-tests/pom.xml similarity index 83% rename from jetty-core/jetty-http3/http3-tests/pom.xml rename to jetty-core/jetty-http3/jetty-http3-tests/pom.xml index c51aefa6371..d2c099b59e6 100644 --- a/jetty-core/jetty-http3/http3-tests/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-tests/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.http3 - http3 + jetty-http3 12.0.0-SNAPSHOT 4.0.0 - http3-tests + jetty-http3-tests Jetty Core :: HTTP3 :: Tests @@ -18,22 +18,22 @@ org.eclipse.jetty.http3 - http3-client + jetty-http3-client test org.eclipse.jetty.http3 - http3-http-client-transport + jetty-http3-client-transport test org.eclipse.jetty.http3 - http3-server + jetty-http3-server test org.eclipse.jetty.quic - quic-server + jetty-quic-server test @@ -48,7 +48,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test diff --git a/jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/AbstractClientServerTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/AbstractClientServerTest.java similarity index 98% rename from jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/AbstractClientServerTest.java rename to jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/AbstractClientServerTest.java index f8e916bbc29..02e06941211 100644 --- a/jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/AbstractClientServerTest.java +++ b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/AbstractClientServerTest.java @@ -27,7 +27,7 @@ import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MetaData; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.client.HTTP3Client; -import org.eclipse.jetty.http3.client.http.ClientConnectionFactoryOverHTTP3; +import org.eclipse.jetty.http3.client.transport.ClientConnectionFactoryOverHTTP3; import org.eclipse.jetty.http3.server.HTTP3ServerConnectionFactory; import org.eclipse.jetty.http3.server.HTTP3ServerConnector; import org.eclipse.jetty.http3.server.RawHTTP3ServerConnectionFactory; diff --git a/jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ClientServerTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ClientServerTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ClientServerTest.java rename to jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ClientServerTest.java diff --git a/jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/DataDemandTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/DataDemandTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/DataDemandTest.java rename to jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/DataDemandTest.java diff --git a/jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ExternalServerTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ExternalServerTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ExternalServerTest.java rename to jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ExternalServerTest.java diff --git a/jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/GoAwayTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/GoAwayTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/GoAwayTest.java rename to jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/GoAwayTest.java diff --git a/jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/HandlerClientServerTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/HandlerClientServerTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/HandlerClientServerTest.java rename to jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/HandlerClientServerTest.java diff --git a/jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/HttpClientTransportOverHTTP3Test.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/HttpClientTransportOverHTTP3Test.java similarity index 100% rename from jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/HttpClientTransportOverHTTP3Test.java rename to jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/HttpClientTransportOverHTTP3Test.java diff --git a/jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/StreamIdleTimeoutTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/StreamIdleTimeoutTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/StreamIdleTimeoutTest.java rename to jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/StreamIdleTimeoutTest.java diff --git a/jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/UnexpectedFrameTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/UnexpectedFrameTest.java similarity index 100% rename from jetty-core/jetty-http3/http3-tests/src/test/java/org/eclipse/jetty/http3/tests/UnexpectedFrameTest.java rename to jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/UnexpectedFrameTest.java diff --git a/jetty-core/jetty-http3/http3-tests/src/test/resources/jetty-logging.properties b/jetty-core/jetty-http3/jetty-http3-tests/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-core/jetty-http3/http3-tests/src/test/resources/jetty-logging.properties rename to jetty-core/jetty-http3/jetty-http3-tests/src/test/resources/jetty-logging.properties diff --git a/jetty-core/jetty-http3/http3-tests/src/test/resources/keystore.p12 b/jetty-core/jetty-http3/jetty-http3-tests/src/test/resources/keystore.p12 similarity index 100% rename from jetty-core/jetty-http3/http3-tests/src/test/resources/keystore.p12 rename to jetty-core/jetty-http3/jetty-http3-tests/src/test/resources/keystore.p12 diff --git a/jetty-core/jetty-http3/pom.xml b/jetty-core/jetty-http3/pom.xml index d597603973d..1dea2a17e0a 100644 --- a/jetty-core/jetty-http3/pom.xml +++ b/jetty-core/jetty-http3/pom.xml @@ -8,17 +8,17 @@ 4.0.0 org.eclipse.jetty.http3 - http3 + jetty-http3 pom Jetty Core :: HTTP3 - http3-qpack - http3-common - http3-server - http3-client - http3-http-client-transport - http3-tests + jetty-http3-qpack + jetty-http3-common + jetty-http3-server + jetty-http3-client + jetty-http3-client-transport + jetty-http3-tests diff --git a/jetty-core/jetty-quic/quic-client/pom.xml b/jetty-core/jetty-quic/jetty-quic-client/pom.xml similarity index 79% rename from jetty-core/jetty-quic/quic-client/pom.xml rename to jetty-core/jetty-quic/jetty-quic-client/pom.xml index bfb114e8633..68e65537d95 100644 --- a/jetty-core/jetty-quic/quic-client/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-client/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.quic - quic + jetty-quic 12.0.0-SNAPSHOT 4.0.0 - quic-client + jetty-quic-client Jetty Core :: QUIC :: Client @@ -21,25 +21,25 @@ org.eclipse.jetty.quic - quic-common + jetty-quic-common org.eclipse.jetty.quic - quic-quiche-jna + jetty-quic-quiche-jna org.eclipse.jetty.quic - quic-server + jetty-quic-server test org.eclipse.jetty.http2 - http2-server + jetty-http2-server test org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test @@ -58,7 +58,7 @@ org.eclipse.jetty.quic - quic-quiche-foreign-incubator + jetty-quic-quiche-foreign-incubator diff --git a/jetty-core/jetty-quic/quic-client/src/main/java/module-info.java b/jetty-core/jetty-quic/jetty-quic-client/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-quic/quic-client/src/main/java/module-info.java rename to jetty-core/jetty-quic/jetty-quic-client/src/main/java/module-info.java diff --git a/jetty-core/jetty-quic/quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientProtocolSession.java b/jetty-core/jetty-quic/jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientProtocolSession.java similarity index 100% rename from jetty-core/jetty-quic/quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientProtocolSession.java rename to jetty-core/jetty-quic/jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientProtocolSession.java diff --git a/jetty-core/jetty-quic/quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientQuicConnection.java b/jetty-core/jetty-quic/jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientQuicConnection.java similarity index 100% rename from jetty-core/jetty-quic/quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientQuicConnection.java rename to jetty-core/jetty-quic/jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientQuicConnection.java diff --git a/jetty-core/jetty-quic/quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientQuicSession.java b/jetty-core/jetty-quic/jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientQuicSession.java similarity index 100% rename from jetty-core/jetty-quic/quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientQuicSession.java rename to jetty-core/jetty-quic/jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientQuicSession.java diff --git a/jetty-core/jetty-quic/quic-client/src/main/java/org/eclipse/jetty/quic/client/QuicClientConnectorConfigurator.java b/jetty-core/jetty-quic/jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/QuicClientConnectorConfigurator.java similarity index 100% rename from jetty-core/jetty-quic/quic-client/src/main/java/org/eclipse/jetty/quic/client/QuicClientConnectorConfigurator.java rename to jetty-core/jetty-quic/jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/QuicClientConnectorConfigurator.java diff --git a/jetty-core/jetty-quic/quic-client/src/test/java/org/eclipse/jetty/quic/client/End2EndClientTest.java b/jetty-core/jetty-quic/jetty-quic-client/src/test/java/org/eclipse/jetty/quic/client/End2EndClientTest.java similarity index 98% rename from jetty-core/jetty-quic/quic-client/src/test/java/org/eclipse/jetty/quic/client/End2EndClientTest.java rename to jetty-core/jetty-quic/jetty-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/jetty-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-core/jetty-quic/quic-client/src/test/resources/jetty-logging.properties b/jetty-core/jetty-quic/jetty-quic-client/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-core/jetty-quic/quic-client/src/test/resources/jetty-logging.properties rename to jetty-core/jetty-quic/jetty-quic-client/src/test/resources/jetty-logging.properties diff --git a/jetty-core/jetty-quic/quic-client/src/test/resources/keystore.p12 b/jetty-core/jetty-quic/jetty-quic-client/src/test/resources/keystore.p12 similarity index 100% rename from jetty-core/jetty-quic/quic-client/src/test/resources/keystore.p12 rename to jetty-core/jetty-quic/jetty-quic-client/src/test/resources/keystore.p12 diff --git a/jetty-core/jetty-quic/quic-common/pom.xml b/jetty-core/jetty-quic/jetty-quic-common/pom.xml similarity index 88% rename from jetty-core/jetty-quic/quic-common/pom.xml rename to jetty-core/jetty-quic/jetty-quic-common/pom.xml index 8cbebc4aaa1..d6e7ce56c90 100644 --- a/jetty-core/jetty-quic/quic-common/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-common/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.quic - quic + jetty-quic 12.0.0-SNAPSHOT 4.0.0 - quic-common + jetty-quic-common Jetty Core :: QUIC :: Common @@ -21,7 +21,7 @@ org.eclipse.jetty.quic - quic-quiche-common + jetty-quic-quiche-common diff --git a/jetty-core/jetty-quic/quic-common/src/main/java/module-info.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-quic/quic-common/src/main/java/module-info.java rename to jetty-core/jetty-quic/jetty-quic-common/src/main/java/module-info.java diff --git a/jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/CloseInfo.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/CloseInfo.java similarity index 100% rename from jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/CloseInfo.java rename to jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/CloseInfo.java diff --git a/jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/ProtocolSession.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/ProtocolSession.java similarity index 100% rename from jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/ProtocolSession.java rename to jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/ProtocolSession.java diff --git a/jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicConfiguration.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicConfiguration.java similarity index 100% rename from jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicConfiguration.java rename to jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicConfiguration.java diff --git a/jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicConnection.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicConnection.java similarity index 100% rename from jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicConnection.java rename to jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicConnection.java diff --git a/jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicSession.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicSession.java similarity index 100% rename from jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicSession.java rename to jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicSession.java diff --git a/jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicSessionContainer.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicSessionContainer.java similarity index 100% rename from jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicSessionContainer.java rename to jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicSessionContainer.java diff --git a/jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicStreamEndPoint.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicStreamEndPoint.java similarity index 100% rename from jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicStreamEndPoint.java rename to jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicStreamEndPoint.java diff --git a/jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/StreamType.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/StreamType.java similarity index 100% rename from jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/StreamType.java rename to jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/StreamType.java diff --git a/jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/internal/QuicErrorCode.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/internal/QuicErrorCode.java similarity index 100% rename from jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/internal/QuicErrorCode.java rename to jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/internal/QuicErrorCode.java diff --git a/jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/package-info.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/package-info.java similarity index 100% rename from jetty-core/jetty-quic/quic-common/src/main/java/org/eclipse/jetty/quic/common/package-info.java rename to jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/package-info.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-common/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml similarity index 92% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-common/pom.xml rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml index 460ad552c49..edc2a86674e 100644 --- a/jetty-core/jetty-quic/quic-quiche/quic-quiche-common/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.quic - quic-quiche + jetty-quic-quiche 12.0.0-SNAPSHOT 4.0.0 - quic-quiche-common + jetty-quic-quiche-common Jetty Core :: QUIC :: Quiche :: Common diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/module-info.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/module-info.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/module-info.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/Quiche.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/Quiche.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/Quiche.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/Quiche.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheBinding.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheBinding.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheBinding.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheBinding.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheConfig.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheConfig.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheConfig.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheConfig.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheConnection.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheConnection.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheConnection.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheConnection.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheConnectionId.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheConnectionId.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheConnectionId.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheConnectionId.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/SSLKeyPair.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/SSLKeyPair.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/SSLKeyPair.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/SSLKeyPair.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml similarity index 93% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml index 3a25efdda98..c628cf3f617 100644 --- a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.quic - quic-quiche + jetty-quic-quiche 12.0.0-SNAPSHOT 4.0.0 - quic-quiche-foreign-incubator + jetty-quic-quiche-foreign-incubator Jetty Core :: QUIC :: Quiche :: Foreign Binding (incubator) @@ -57,7 +57,7 @@ org.eclipse.jetty.quic - quic-quiche-common + jetty-quic-quiche-common org.eclipse.jetty diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/module-info.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/module-info.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/module-info.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/ForeignIncubatorQuicheBinding.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/ForeignIncubatorQuicheBinding.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/ForeignIncubatorQuicheBinding.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/ForeignIncubatorQuicheBinding.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/ForeignIncubatorQuicheConnection.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/ForeignIncubatorQuicheConnection.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/ForeignIncubatorQuicheConnection.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/ForeignIncubatorQuicheConnection.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/NativeHelper.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/NativeHelper.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/NativeHelper.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/NativeHelper.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/linux/sockaddr_linux.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/linux/sockaddr_linux.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/linux/sockaddr_linux.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/linux/sockaddr_linux.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/macos/sockaddr_macos.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/macos/sockaddr_macos.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/macos/sockaddr_macos.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/macos/sockaddr_macos.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_h.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_h.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_h.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_h.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_recv_info.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_recv_info.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_recv_info.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_recv_info.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_send_info.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_send_info.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_send_info.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_send_info.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_stats.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_stats.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_stats.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_stats.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/sockaddr.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/sockaddr.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/sockaddr.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/sockaddr.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/windows/sockaddr_windows.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/windows/sockaddr_windows.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/windows/sockaddr_windows.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/windows/sockaddr_windows.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/resources/META-INF/services/org.eclipse.jetty.quic.quiche.QuicheBinding b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/resources/META-INF/services/org.eclipse.jetty.quic.quiche.QuicheBinding similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/resources/META-INF/services/org.eclipse.jetty.quic.quiche.QuicheBinding rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/main/resources/META-INF/services/org.eclipse.jetty.quic.quiche.QuicheBinding diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/test/java/org/eclipse/jetty/quic/quiche/foreign/incubator/LowLevelQuicheTest.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/test/java/org/eclipse/jetty/quic/quiche/foreign/incubator/LowLevelQuicheTest.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/test/java/org/eclipse/jetty/quic/quiche/foreign/incubator/LowLevelQuicheTest.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/test/java/org/eclipse/jetty/quic/quiche/foreign/incubator/LowLevelQuicheTest.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/test/resources/jetty-logging.properties b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/test/resources/jetty-logging.properties rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/test/resources/jetty-logging.properties diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/test/resources/keystore.p12 b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/test/resources/keystore.p12 similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/test/resources/keystore.p12 rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/src/test/resources/keystore.p12 diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml similarity index 90% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml index f8b10857a8c..07e3ae3b15a 100644 --- a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.quic - quic-quiche + jetty-quic-quiche 12.0.0-SNAPSHOT 4.0.0 - quic-quiche-jna + jetty-quic-quiche-jna Jetty Core :: QUIC :: Quiche :: JNA Binding @@ -34,7 +34,7 @@ org.eclipse.jetty.quic - quic-quiche-common + jetty-quic-quiche-common net.java.dev.jna diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/module-info.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/module-info.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/module-info.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/JnaQuicheBinding.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/JnaQuicheBinding.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/JnaQuicheBinding.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/JnaQuicheBinding.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/JnaQuicheConnection.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/JnaQuicheConnection.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/JnaQuicheConnection.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/JnaQuicheConnection.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/LibQuiche.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/LibQuiche.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/LibQuiche.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/LibQuiche.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/SizedStructure.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/SizedStructure.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/SizedStructure.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/SizedStructure.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/bool_pointer.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/bool_pointer.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/bool_pointer.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/bool_pointer.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/char_pointer.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/char_pointer.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/char_pointer.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/char_pointer.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/linux/netinet_linux.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/linux/netinet_linux.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/linux/netinet_linux.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/linux/netinet_linux.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/macos/netinet_macos.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/macos/netinet_macos.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/macos/netinet_macos.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/macos/netinet_macos.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/size_t.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/size_t.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/size_t.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/size_t.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/size_t_pointer.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/size_t_pointer.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/size_t_pointer.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/size_t_pointer.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/sockaddr.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/sockaddr.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/sockaddr.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/sockaddr.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/sockaddr_storage.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/sockaddr_storage.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/sockaddr_storage.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/sockaddr_storage.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/ssize_t.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/ssize_t.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/ssize_t.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/ssize_t.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/timespec.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/timespec.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/timespec.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/timespec.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint16_t.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint16_t.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint16_t.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint16_t.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint32_t.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint32_t.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint32_t.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint32_t.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint32_t_pointer.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint32_t_pointer.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint32_t_pointer.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint32_t_pointer.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint64_t.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint64_t.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint64_t.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint64_t.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint64_t_pointer.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint64_t_pointer.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint64_t_pointer.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint64_t_pointer.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint8_t.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint8_t.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint8_t.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint8_t.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint8_t_pointer.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint8_t_pointer.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint8_t_pointer.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/uint8_t_pointer.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/windows/netinet_windows.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/windows/netinet_windows.java similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/windows/netinet_windows.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/windows/netinet_windows.java diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/resources/META-INF/services/org.eclipse.jetty.quic.quiche.QuicheBinding b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/resources/META-INF/services/org.eclipse.jetty.quic.quiche.QuicheBinding similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/main/resources/META-INF/services/org.eclipse.jetty.quic.quiche.QuicheBinding rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/resources/META-INF/services/org.eclipse.jetty.quic.quiche.QuicheBinding diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/test/java/org/eclipse/jetty/quic/quiche/jna/LowLevelQuicheTest.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/test/java/org/eclipse/jetty/quic/quiche/jna/LowLevelQuicheTest.java similarity index 99% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/test/java/org/eclipse/jetty/quic/quiche/jna/LowLevelQuicheTest.java rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/test/java/org/eclipse/jetty/quic/quiche/jna/LowLevelQuicheTest.java index 25466936a84..af3d9b1ed2f 100644 --- a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/test/java/org/eclipse/jetty/quic/quiche/jna/LowLevelQuicheTest.java +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/test/java/org/eclipse/jetty/quic/quiche/jna/LowLevelQuicheTest.java @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Objects; + import org.eclipse.jetty.quic.quiche.QuicheConfig; import org.eclipse.jetty.quic.quiche.QuicheConnection; import org.eclipse.jetty.quic.quiche.SSLKeyPair; diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/test/resources/jetty-logging.properties b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/test/resources/jetty-logging.properties rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/test/resources/jetty-logging.properties diff --git a/jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/test/resources/keystore.p12 b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/test/resources/keystore.p12 similarity index 100% rename from jetty-core/jetty-quic/quic-quiche/quic-quiche-jna/src/test/resources/keystore.p12 rename to jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/test/resources/keystore.p12 diff --git a/jetty-core/jetty-quic/quic-quiche/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/pom.xml similarity index 74% rename from jetty-core/jetty-quic/quic-quiche/pom.xml rename to jetty-core/jetty-quic/jetty-quic-quiche/pom.xml index e38c5b93ac2..613c77907fe 100644 --- a/jetty-core/jetty-quic/quic-quiche/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/pom.xml @@ -2,18 +2,18 @@ org.eclipse.jetty.quic - quic + jetty-quic 12.0.0-SNAPSHOT 4.0.0 - quic-quiche + jetty-quic-quiche pom Jetty Core :: QUIC :: Quiche - quic-quiche-common - quic-quiche-jna + jetty-quic-quiche-common + jetty-quic-quiche-jna @@ -23,7 +23,7 @@ [17,) - quic-quiche-foreign-incubator + jetty-quic-quiche-foreign-incubator diff --git a/jetty-core/jetty-quic/quic-server/pom.xml b/jetty-core/jetty-quic/jetty-quic-server/pom.xml similarity index 84% rename from jetty-core/jetty-quic/quic-server/pom.xml rename to jetty-core/jetty-quic/jetty-quic-server/pom.xml index 14f2ef5110a..0cbaffc476a 100644 --- a/jetty-core/jetty-quic/quic-server/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-server/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.quic - quic + jetty-quic 12.0.0-SNAPSHOT 4.0.0 - quic-server + jetty-quic-server Jetty Core :: QUIC :: Server @@ -25,11 +25,11 @@ org.eclipse.jetty.quic - quic-common + jetty-quic-common org.eclipse.jetty.quic - quic-quiche-jna + jetty-quic-quiche-jna org.eclipse.jetty @@ -47,7 +47,7 @@ org.eclipse.jetty.quic - quic-quiche-foreign-incubator + jetty-quic-quiche-foreign-incubator diff --git a/jetty-core/jetty-quic/quic-server/src/main/java/module-info.java b/jetty-core/jetty-quic/jetty-quic-server/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-quic/quic-server/src/main/java/module-info.java rename to jetty-core/jetty-quic/jetty-quic-server/src/main/java/module-info.java diff --git a/jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/H3Server.puml b/jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/H3Server.puml similarity index 100% rename from jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/H3Server.puml rename to jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/H3Server.puml diff --git a/jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/QuicServerConnector.java b/jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/QuicServerConnector.java similarity index 100% rename from jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/QuicServerConnector.java rename to jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/QuicServerConnector.java diff --git a/jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/ServerProtocolSession.java b/jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/ServerProtocolSession.java similarity index 100% rename from jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/ServerProtocolSession.java rename to jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/ServerProtocolSession.java diff --git a/jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/ServerQuicConnection.java b/jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/ServerQuicConnection.java similarity index 100% rename from jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/ServerQuicConnection.java rename to jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/ServerQuicConnection.java diff --git a/jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/ServerQuicSession.java b/jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/ServerQuicSession.java similarity index 100% rename from jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/ServerQuicSession.java rename to jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/ServerQuicSession.java diff --git a/jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/internal/SimpleTokenMinter.java b/jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/internal/SimpleTokenMinter.java similarity index 100% rename from jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/internal/SimpleTokenMinter.java rename to jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/internal/SimpleTokenMinter.java diff --git a/jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/internal/SimpleTokenValidator.java b/jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/internal/SimpleTokenValidator.java similarity index 100% rename from jetty-core/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/internal/SimpleTokenValidator.java rename to jetty-core/jetty-quic/jetty-quic-server/src/main/java/org/eclipse/jetty/quic/server/internal/SimpleTokenValidator.java diff --git a/jetty-core/jetty-quic/quic-server/src/test/java/org/eclipse/jetty/quic/server/ServerQuicConnectorTest.java b/jetty-core/jetty-quic/jetty-quic-server/src/test/java/org/eclipse/jetty/quic/server/ServerQuicConnectorTest.java similarity index 100% rename from jetty-core/jetty-quic/quic-server/src/test/java/org/eclipse/jetty/quic/server/ServerQuicConnectorTest.java rename to jetty-core/jetty-quic/jetty-quic-server/src/test/java/org/eclipse/jetty/quic/server/ServerQuicConnectorTest.java diff --git a/jetty-core/jetty-quic/quic-server/src/test/resources/jetty-logging.properties b/jetty-core/jetty-quic/jetty-quic-server/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-core/jetty-quic/quic-server/src/test/resources/jetty-logging.properties rename to jetty-core/jetty-quic/jetty-quic-server/src/test/resources/jetty-logging.properties diff --git a/jetty-core/jetty-quic/quic-server/src/test/resources/keystore.p12 b/jetty-core/jetty-quic/jetty-quic-server/src/test/resources/keystore.p12 similarity index 100% rename from jetty-core/jetty-quic/quic-server/src/test/resources/keystore.p12 rename to jetty-core/jetty-quic/jetty-quic-server/src/test/resources/keystore.p12 diff --git a/jetty-core/jetty-quic/pom.xml b/jetty-core/jetty-quic/pom.xml index 3420abe7083..e21ee15410a 100644 --- a/jetty-core/jetty-quic/pom.xml +++ b/jetty-core/jetty-quic/pom.xml @@ -8,15 +8,15 @@ 4.0.0 org.eclipse.jetty.quic - quic + jetty-quic pom Jetty Core :: QUIC - quic-quiche - quic-common - quic-server - quic-client + jetty-quic-quiche + jetty-quic-common + jetty-quic-server + jetty-quic-client diff --git a/jetty-core/jetty-websocket/websocket-core-client/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml similarity index 89% rename from jetty-core/jetty-websocket/websocket-core-client/pom.xml rename to jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml index e3700778439..74b454fee95 100644 --- a/jetty-core/jetty-websocket/websocket-core-client/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.websocket - websocket + jetty-websocket 12.0.0-SNAPSHOT 4.0.0 - websocket-core-client + jetty-websocket-core-client Jetty Core :: Websocket :: Core :: Client @@ -17,7 +17,7 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common org.eclipse.jetty diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/module-info.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/module-info.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/module-info.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java similarity index 97% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java index 04b5169d5af..1a03bd91e46 100644 --- a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java @@ -16,7 +16,6 @@ package org.eclipse.jetty.websocket.core.client.internal; import java.net.URL; import org.eclipse.jetty.client.HttpClient; -import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceFactory; import org.eclipse.jetty.xml.XmlConfiguration; import org.slf4j.Logger; diff --git a/jetty-core/jetty-websocket/websocket-core-common/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml similarity index 94% rename from jetty-core/jetty-websocket/websocket-core-common/pom.xml rename to jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml index f6ae7b2817f..13678f42736 100644 --- a/jetty-core/jetty-websocket/websocket-core-common/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.websocket - websocket + jetty-websocket 12.0.0-SNAPSHOT 4.0.0 - websocket-core-common + jetty-websocket-core-common Jetty Core :: Websocket :: Core :: Common diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/module-info.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/module-info.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/module-info.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Extension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Extension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Extension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Extension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Frame.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Frame.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Frame.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Frame.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandChain.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandChain.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandChain.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandChain.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandingFlusher.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandingFlusher.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandingFlusher.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandingFlusher.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/FrameValidation.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/FrameValidation.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/FrameValidation.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/FrameValidation.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension diff --git a/jetty-core/jetty-websocket/websocket-core-server/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml similarity index 83% rename from jetty-core/jetty-websocket/websocket-core-server/pom.xml rename to jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml index 8785e5711d6..d362a92c5e2 100644 --- a/jetty-core/jetty-websocket/websocket-core-server/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.websocket - websocket + jetty-websocket 12.0.0-SNAPSHOT 4.0.0 - websocket-core-server + jetty-websocket-core-server Jetty Core :: Websocket :: Core :: Server @@ -17,7 +17,7 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common org.eclipse.jetty diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/config/modules/websocket.mod b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/config/modules/websocket.mod similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/config/modules/websocket.mod rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/config/modules/websocket.mod diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/module-info.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/module-info.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/module-info.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HttpFieldsWrapper.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HttpFieldsWrapper.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HttpFieldsWrapper.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HttpFieldsWrapper.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/WebSocketHttpFieldsWrapper.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/WebSocketHttpFieldsWrapper.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/WebSocketHttpFieldsWrapper.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/WebSocketHttpFieldsWrapper.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/fuzzingclient.json b/jetty-core/jetty-websocket/jetty-websocket-core-tests/fuzzingclient.json similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/fuzzingclient.json rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/fuzzingclient.json diff --git a/jetty-core/jetty-websocket/websocket-core-tests/fuzzingserver.json b/jetty-core/jetty-websocket/jetty-websocket-core-tests/fuzzingserver.json similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/fuzzingserver.json rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/fuzzingserver.json diff --git a/jetty-core/jetty-websocket/websocket-core-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml similarity index 93% rename from jetty-core/jetty-websocket/websocket-core-tests/pom.xml rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml index 4b182fc3a9d..ebd4d420d74 100644 --- a/jetty-core/jetty-websocket/websocket-core-tests/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.websocket - websocket + jetty-websocket 12.0.0-SNAPSHOT 4.0.0 - websocket-core-tests + jetty-websocket-core-tests Jetty Core :: Websocket :: Core :: Tests @@ -17,15 +17,15 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common org.eclipse.jetty diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandingIncomingFramesCapture.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandingIncomingFramesCapture.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandingIncomingFramesCapture.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandingIncomingFramesCapture.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeWithLeftOverHttpBytesTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeWithLeftOverHttpBytesTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeWithLeftOverHttpBytesTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeWithLeftOverHttpBytesTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketEchoTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketEchoTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketEchoTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketEchoTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServerComponentsTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServerComponentsTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServerComponentsTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServerComponentsTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PermessageDeflateDemandTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PermessageDeflateDemandTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PermessageDeflateDemandTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PermessageDeflateDemandTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/resources/jetty-logging.properties b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/resources/jetty-logging.properties rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/resources/jetty-logging.properties diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/resources/keystore.p12 b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/resources/keystore.p12 similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/resources/keystore.p12 rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/resources/keystore.p12 diff --git a/jetty-core/jetty-websocket/pom.xml b/jetty-core/jetty-websocket/pom.xml index c02c2385abd..74bc5c3c6c0 100644 --- a/jetty-core/jetty-websocket/pom.xml +++ b/jetty-core/jetty-websocket/pom.xml @@ -8,15 +8,15 @@ 4.0.0 org.eclipse.jetty.websocket - websocket + jetty-websocket pom Jetty Core :: WebSocket - websocket-core-client - websocket-core-common - websocket-core-server - websocket-core-tests + jetty-websocket-core-client + jetty-websocket-core-common + jetty-websocket-core-server + jetty-websocket-core-tests 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 795cd4ac577..8fd720e39c8 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 @@ -5,7 +5,7 @@ 12.0.0-SNAPSHOT 4.0.0 - jetty-demo-ee10-jetty-embedded + jetty-ee10-demo-embedded EE10 :: Jetty Demo :: Embedded Jetty Embedded Jetty Demos @@ -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-home/pom.xml b/jetty-ee10/jetty-ee10-home/pom.xml index 231b66886ff..d98ca3ace11 100644 --- a/jetty-ee10/jetty-ee10-home/pom.xml +++ b/jetty-ee10/jetty-ee10-home/pom.xml @@ -301,7 +301,7 @@ org.eclipse.jetty.ee10 - websocket-core-client,websocket-core-common,websocket-core-server + jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket jar ${assembly-directory}/lib 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 38e1307252e..cd85aa692d5 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,22 +90,22 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test org.eclipse.jetty.http3 - http3-server + jetty-http3-server test org.eclipse.jetty.http3 - http3-http-client-transport + jetty-http3-client-transport test @@ -115,7 +115,7 @@ org.eclipse.jetty.fcgi - fcgi-server + jetty-fcgi-server 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..aafbeba8f6f 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,13 +34,13 @@ 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; -import org.eclipse.jetty.http3.client.http.internal.HttpConnectionOverHTTP3; +import org.eclipse.jetty.http3.client.transport.HttpClientTransportOverHTTP3; +import org.eclipse.jetty.http3.client.transport.internal.HttpChannelOverHTTP3; +import org.eclipse.jetty.http3.client.transport.internal.HttpConnectionOverHTTP3; import org.eclipse.jetty.http3.client.internal.HTTP3SessionClient; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.io.EndPoint; diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/HttpClientTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/HttpClientTest.java index e53c9cd411c..2fcb0c64a36 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/HttpClientTest.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http-client-transport/src/test/java/org/eclipse/jetty/ee10/http/client/HttpClientTest.java @@ -47,7 +47,7 @@ import org.eclipse.jetty.http.HttpScheme; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpURI; import org.eclipse.jetty.http2.FlowControlStrategy; -import org.eclipse.jetty.http3.client.http.HttpClientTransportOverHTTP3; +import org.eclipse.jetty.http3.client.transport.HttpClientTransportOverHTTP3; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.handler.AbstractHandler; 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..7711b042134 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,12 +34,12 @@ 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; import org.eclipse.jetty.http3.client.HTTP3Client; -import org.eclipse.jetty.http3.client.http.HttpClientTransportOverHTTP3; +import org.eclipse.jetty.http3.client.transport.HttpClientTransportOverHTTP3; import org.eclipse.jetty.http3.server.AbstractHTTP3ServerConnectionFactory; import org.eclipse.jetty.http3.server.HTTP3ServerConnectionFactory; import org.eclipse.jetty.http3.server.HTTP3ServerConnector; 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-jakarta-client/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml index 6a144429414..69feeef2113 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml @@ -29,7 +29,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml index e8af39f1370..9ddc3c0aad5 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.slf4j diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod index c259347aecf..714514cc639 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod @@ -12,9 +12,9 @@ client ee10-annotations [lib] -lib/ee10-websocket/websocket-core-common-${jetty.version}.jar -lib/ee10-websocket/websocket-core-client-${jetty.version}.jar -lib/ee10-websocket/websocket-core-server-${jetty.version}.jar +lib/ee10-websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/ee10-websocket/jetty-websocket-core-client-${jetty.version}.jar +lib/ee10-websocket/jetty-websocket-core-server-${jetty.version}.jar lib/ee10-websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar lib/ee10-websocket/jakarta.websocket-client-api-2.1.0.jar lib/ee10-websocket/jakarta.websocket-api-2.1.0.jar diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java index 49926a76eb4..2751cd53ed9 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java @@ -144,11 +144,11 @@ public class JakartaClientClassLoaderTest // Copy over the individual jars required for Javax WebSocket. app.createWebInf(); - app.copyLib(JakartaWebSocketClientContainerProvider.class, "websocket-javax-client.jar"); - app.copyLib(JakartaWebSocketContainer.class, "websocket-javax-common.jar"); + app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee10-websocket-jakarta-client.jar"); + app.copyLib(JakartaWebSocketContainer.class, "jetty-ee10-websocket-jakarta-common.jar"); app.copyLib(ContainerLifeCycle.class, "jetty-util.jar"); - app.copyLib(CoreClientUpgradeRequest.class, "websocket-core-client.jar"); - app.copyLib(WebSocketComponents.class, "websocket-core-common.jar"); + app.copyLib(CoreClientUpgradeRequest.class, "jetty-websocket-core-client.jar"); + app.copyLib(WebSocketComponents.class, "jetty-websocket-core-common.jar"); app.copyLib(Response.class, "jetty-client.jar"); app.copyLib(ByteBufferPool.class, "jetty-io.jar"); app.copyLib(BadMessageException.class, "jetty-http.jar"); diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java index dfc862bc71b..0c94fd44a1b 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java @@ -93,11 +93,11 @@ public class JakartaClientShutdownWithServerWebAppTest // Copy over the individual jars required for Jakarta WebSocket. app.createWebInf(); - app.copyLib(JakartaWebSocketClientContainerProvider.class, "websocket-jakarta-client.jar"); - app.copyLib(JakartaWebSocketContainer.class, "websocket-jakarta-common.jar"); + app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee10-websocket-jakarta-client.jar"); + app.copyLib(JakartaWebSocketContainer.class, "jetty-ee10-websocket-jakarta-common.jar"); app.copyLib(ContainerLifeCycle.class, "jetty-util.jar"); - app.copyLib(CoreClientUpgradeRequest.class, "websocket-core-client.jar"); - app.copyLib(WebSocketComponents.class, "websocket-core-common.jar"); + app.copyLib(CoreClientUpgradeRequest.class, "jetty-websocket-core-client.jar"); + app.copyLib(WebSocketComponents.class, "jetty-websocket-core-common.jar"); app.copyLib(Response.class, "jetty-client.jar"); app.copyLib(ByteBufferPool.class, "jetty-io.jar"); app.copyLib(BadMessageException.class, "jetty-http.jar"); diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml index 0d873564051..21893f7b70b 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml @@ -45,7 +45,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-common/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-common/pom.xml index 53bf3c3c14e..ceb57724bd2 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-common/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-common/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common org.eclipse.jetty 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/JettyClientClassLoaderTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/JettyClientClassLoaderTest.java index 7bae3318af6..885a429676b 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/JettyClientClassLoaderTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/JettyClientClassLoaderTest.java @@ -162,12 +162,12 @@ public class JettyClientClassLoaderTest // Copy over the individual jars required for Javax WebSocket. app.createWebInf(); - app.copyLib(WebSocketPolicy.class, "websocket-jetty-api.jar"); - app.copyLib(WebSocketClient.class, "websocket-jetty-client.jar"); - app.copyLib(WebSocketSession.class, "websocket-jetty-common.jar"); + app.copyLib(WebSocketPolicy.class, "jetty-ee10-websocket-jetty-api.jar"); + app.copyLib(WebSocketClient.class, "jetty-ee10-websocket-jetty-client.jar"); + app.copyLib(WebSocketSession.class, "jetty-ee10-websocket-jetty-common.jar"); app.copyLib(ContainerLifeCycle.class, "jetty-util.jar"); - app.copyLib(CoreClientUpgradeRequest.class, "websocket-core-client.jar"); - app.copyLib(WebSocketComponents.class, "websocket-core-common.jar"); + app.copyLib(CoreClientUpgradeRequest.class, "jetty-websocket-core-client.jar"); + app.copyLib(WebSocketComponents.class, "jetty-websocket-core-common.jar"); app.copyLib(Response.class, "jetty-client.jar"); app.copyLib(ByteBufferPool.class, "jetty-io.jar"); app.copyLib(BadMessageException.class, "jetty-http.jar"); 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-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml index 1f7454673f6..3d2272d8a7f 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server org.eclipse.jetty.ee10 diff --git a/jetty-ee8/jetty-ee8-home/pom.xml b/jetty-ee8/jetty-ee8-home/pom.xml index a3042cc9b44..ccf7e86bb6a 100644 --- a/jetty-ee8/jetty-ee8-home/pom.xml +++ b/jetty-ee8/jetty-ee8-home/pom.xml @@ -280,7 +280,7 @@ org.eclipse.jetty.ee8 - websocket-core-client,websocket-core-common,websocket-core-server + jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket jar ${assembly-directory}/lib diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml index 4e72632bdcf..6614968e8df 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml @@ -27,7 +27,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml index c3684b58fd0..467ba96fb42 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml @@ -40,7 +40,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.slf4j diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod index 949532334b7..6e5f224529b 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod @@ -12,9 +12,9 @@ client ee8-annotations [lib] -lib/ee8-websocket/websocket-core-common-${jetty.version}.jar -lib/ee8-websocket/websocket-core-client-${jetty.version}.jar -lib/ee8-websocket/websocket-core-server-${jetty.version}.jar +lib/ee8-websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/ee8-websocket/jetty-websocket-core-client-${jetty.version}.jar +lib/ee8-websocket/jetty-websocket-core-server-${jetty.version}.jar lib/ee8-websocket/jetty-ee8-websocket-servlet-${jetty.version}.jar lib/ee8-websocket/jetty-jakarta-websocket-api-2.0.0.jar lib/ee8-websocket/jetty-ee8-websocket-javax-client-${jetty.version}.jar diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml index d40dfd4320a..d73f29e8021 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod index 49c6e21c2f9..3f3f2a7e2ae 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod @@ -14,8 +14,8 @@ client ee8-annotations [lib] -lib/ee8-websocket/websocket-core-common-${jetty.version}.jar -lib/ee8-websocket/websocket-core-client-${jetty.version}.jar +lib/ee8-websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/ee8-websocket/jetty-websocket-core-client-${jetty.version}.jar lib/ee8-websocket/jetty-ee8-websocket-jetty-api-${jetty.version}.jar lib/ee8-websocket/jetty-ee8-websocket-jetty-common-${jetty.version}.jar lib/ee8-websocket/jetty-ee8-websocket-jetty-client-${jetty.version}.jar diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml index dca01aaf591..9c8c6329d43 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common org.eclipse.jetty diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod index bbc2a3beb2c..f44ea107e25 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod @@ -13,8 +13,8 @@ websocket ee8-annotations [lib] -lib/ee8-websocket/websocket-core-common-${jetty.version}.jar -lib/ee8-websocket/websocket-core-server-${jetty.version}.jar +lib/ee8-websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/ee8-websocket/jetty-websocket-core-server-${jetty.version}.jar lib/ee8-websocket/jetty-ee8-websocket-servlet-${jetty.version}.jar lib/ee8-websocket/jetty-ee8-websocket-jetty-api-${jetty.version}.jar lib/ee8-websocket/jetty-ee8-websocket-jetty-common-${jetty.version}.jar 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-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml index 4e8c38b05a5..5301c8ffe06 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server org.eclipse.jetty.ee8 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 ee1684de72d..346141cd47e 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 002f8e00d45..6780ccf2940 100644 --- a/jetty-ee9/jetty-ee9-fcgi-server-proxy/pom.xml +++ b/jetty-ee9/jetty-ee9-fcgi-server-proxy/pom.xml @@ -23,7 +23,7 @@ org.eclipse.jetty.fcgi - fcgi-server + jetty-fcgi-server @@ -43,7 +43,7 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test diff --git a/jetty-ee9/jetty-ee9-home/pom.xml b/jetty-ee9/jetty-ee9-home/pom.xml index a85d1afbc50..23b253cc29e 100644 --- a/jetty-ee9/jetty-ee9-home/pom.xml +++ b/jetty-ee9/jetty-ee9-home/pom.xml @@ -290,7 +290,7 @@ org.eclipse.jetty.ee9 - websocket-core-client,websocket-core-common,websocket-core-server + jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket jar ${assembly-directory}/lib 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-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java index 94fb8d1b562..b88c4e87a61 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java @@ -197,18 +197,18 @@ public class TestOSGiUtil res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-jndi").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-plus").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-annotations").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-server").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-client").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-common").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-servlet").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-api").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-server").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-client").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-common").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-server").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-client").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-common").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-servlet").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jetty-api").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jetty-server").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jetty-client").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jetty-common").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty.toolchain").artifactId("jetty-jakarta-websocket-api").versionAsInProject().noStart()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jakarta-server").versionAsInProject().noStart()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jakarta-client").versionAsInProject().noStart()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jakarta-common").versionAsInProject().noStart()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jakarta-server").versionAsInProject().noStart()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jakarta-client").versionAsInProject().noStart()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jakarta-common").versionAsInProject().noStart()); res.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("jetty-ee9-osgi-boot").versionAsInProject().start()); } 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 25f58340e65..11443be5120 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,22 +114,22 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server test org.eclipse.jetty.http2 - http2-http-client-transport + jetty-http2-client-transport test org.eclipse.jetty.http3 - http3-server + jetty-http3-server test org.eclipse.jetty.http3 - http3-http-client-transport + jetty-http3-client-transport test @@ -139,7 +139,7 @@ org.eclipse.jetty.fcgi - fcgi-server + jetty-fcgi-server 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..8395bb1312e 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,13 +34,13 @@ 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; -import org.eclipse.jetty.http3.client.http.internal.HttpConnectionOverHTTP3; +import org.eclipse.jetty.http3.client.transport.HttpClientTransportOverHTTP3; +import org.eclipse.jetty.http3.client.transport.internal.HttpChannelOverHTTP3; +import org.eclipse.jetty.http3.client.transport.internal.HttpConnectionOverHTTP3; import org.eclipse.jetty.http3.client.internal.HTTP3SessionClient; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.io.EndPoint; diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/HttpClientTest.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/HttpClientTest.java index cfb512effb9..37ebf8e742a 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/HttpClientTest.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http-client-transport/src/test/java/org/eclipse/jetty/ee9/http/client/HttpClientTest.java @@ -47,7 +47,7 @@ import org.eclipse.jetty.http.HttpScheme; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpURI; import org.eclipse.jetty.http2.FlowControlStrategy; -import org.eclipse.jetty.http3.client.http.HttpClientTransportOverHTTP3; +import org.eclipse.jetty.http3.client.transport.HttpClientTransportOverHTTP3; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.handler.AbstractHandler; 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..21ccc433d74 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,12 +34,12 @@ 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; import org.eclipse.jetty.http3.client.HTTP3Client; -import org.eclipse.jetty.http3.client.http.HttpClientTransportOverHTTP3; +import org.eclipse.jetty.http3.client.transport.HttpClientTransportOverHTTP3; import org.eclipse.jetty.http3.server.AbstractHTTP3ServerConnectionFactory; import org.eclipse.jetty.http3.server.HTTP3ServerConnectionFactory; import org.eclipse.jetty.http3.server.HTTP3ServerConnector; 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-jakarta-client/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml index 7b44601c9e3..ae92d9a235d 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml @@ -26,7 +26,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml index 2cda6dd54b8..23b1c884adb 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml @@ -39,7 +39,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.slf4j diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod index 2536caeb889..d09efb7647f 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod @@ -12,9 +12,9 @@ client ee9-annotations [lib] -lib/ee9-websocket/websocket-core-common-${jetty.version}.jar -lib/ee9-websocket/websocket-core-client-${jetty.version}.jar -lib/ee9-websocket/websocket-core-server-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-client-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-server-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-servlet-${jetty.version}.jar lib/ee9-websocket/jetty-jakarta-websocket-api-2.0.0.jar lib/ee9-websocket/jetty-ee9-websocket-jakarta-client-${jetty.version}.jar diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java index 73dbb21f4ed..d480cd6ef95 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java @@ -144,11 +144,11 @@ public class JakartaClientClassLoaderTest // Copy over the individual jars required for Javax WebSocket. app.createWebInf(); - app.copyLib(JakartaWebSocketClientContainerProvider.class, "websocket-javax-client.jar"); - app.copyLib(JakartaWebSocketContainer.class, "websocket-javax-common.jar"); + app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee9-websocket-jakarta-client.jar"); + app.copyLib(JakartaWebSocketContainer.class, "jetty-ee9-websocket-jakarta-common.jar"); app.copyLib(ContainerLifeCycle.class, "jetty-util.jar"); - app.copyLib(CoreClientUpgradeRequest.class, "websocket-core-client.jar"); - app.copyLib(WebSocketComponents.class, "websocket-core-common.jar"); + app.copyLib(CoreClientUpgradeRequest.class, "jetty-websocket-core-client.jar"); + app.copyLib(WebSocketComponents.class, "jetty-websocket-core-common.jar"); app.copyLib(Response.class, "jetty-client.jar"); app.copyLib(ByteBufferPool.class, "jetty-io.jar"); app.copyLib(BadMessageException.class, "jetty-http.jar"); diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java index a95dd6dff87..b374cf1c007 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java @@ -93,11 +93,11 @@ public class JakartaClientShutdownWithServerWebAppTest // Copy over the individual jars required for Jakarta WebSocket. app.createWebInf(); - app.copyLib(JakartaWebSocketClientContainerProvider.class, "websocket-jakarta-client.jar"); - app.copyLib(JakartaWebSocketContainer.class, "websocket-jakarta-common.jar"); + app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee9-websocket-jakarta-client.jar"); + app.copyLib(JakartaWebSocketContainer.class, "jetty-ee9-websocket-jakarta-common.jar"); app.copyLib(ContainerLifeCycle.class, "jetty-util.jar"); - app.copyLib(CoreClientUpgradeRequest.class, "websocket-core-client.jar"); - app.copyLib(WebSocketComponents.class, "websocket-core-common.jar"); + app.copyLib(CoreClientUpgradeRequest.class, "jetty-websocket-core-client.jar"); + app.copyLib(WebSocketComponents.class, "jetty-websocket-core-common.jar"); app.copyLib(Response.class, "jetty-client.jar"); app.copyLib(ByteBufferPool.class, "jetty-io.jar"); app.copyLib(BadMessageException.class, "jetty-http.jar"); diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml index 2ff742d97c9..c0db684db5b 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml @@ -45,7 +45,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/config/modules/ee9-websocket-jetty-client.mod b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/config/modules/ee9-websocket-jetty-client.mod index 4fa27a578cc..4ac6825a91a 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/config/modules/ee9-websocket-jetty-client.mod +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/config/modules/ee9-websocket-jetty-client.mod @@ -14,8 +14,8 @@ client ee9-annotations [lib] -lib/ee9-websocket/websocket-core-common-${jetty.version}.jar -lib/ee9-websocket/websocket-core-client-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-client-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-jetty-api-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-jetty-common-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-jetty-client-${jetty.version}.jar diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml index 300107e4e65..d68bfcb351e 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common org.eclipse.jetty diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/config/modules/ee9-websocket-jetty.mod b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/config/modules/ee9-websocket-jetty.mod index 9c62fd26247..c0dbdf7e31f 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/config/modules/ee9-websocket-jetty.mod +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/config/modules/ee9-websocket-jetty.mod @@ -11,8 +11,8 @@ ee9 ee9-annotations [lib] -lib/ee9-websocket/websocket-core-common-${jetty.version}.jar -lib/ee9-websocket/websocket-core-server-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-server-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-servlet-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-jetty-api-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-jetty-common-${jetty.version}.jar 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/JettyClientClassLoaderTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyClientClassLoaderTest.java index 04674463a64..60a18a5945e 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyClientClassLoaderTest.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyClientClassLoaderTest.java @@ -162,12 +162,12 @@ public class JettyClientClassLoaderTest // Copy over the individual jars required for Javax WebSocket. app.createWebInf(); - app.copyLib(WebSocketPolicy.class, "websocket-jetty-api.jar"); - app.copyLib(WebSocketClient.class, "websocket-jetty-client.jar"); - app.copyLib(WebSocketSession.class, "websocket-jetty-common.jar"); + app.copyLib(WebSocketPolicy.class, "jetty-ee9-websocket-jetty-api.jar"); + app.copyLib(WebSocketClient.class, "jetty-ee9-websocket-jetty-client.jar"); + app.copyLib(WebSocketSession.class, "jetty-ee9-websocket-jetty-common.jar"); app.copyLib(ContainerLifeCycle.class, "jetty-util.jar"); - app.copyLib(CoreClientUpgradeRequest.class, "websocket-core-client.jar"); - app.copyLib(WebSocketComponents.class, "websocket-core-common.jar"); + app.copyLib(CoreClientUpgradeRequest.class, "jetty-websocket-core-client.jar"); + app.copyLib(WebSocketComponents.class, "jetty-websocket-core-common.jar"); app.copyLib(Response.class, "jetty-client.jar"); app.copyLib(ByteBufferPool.class, "jetty-io.jar"); app.copyLib(BadMessageException.class, "jetty-http.jar"); 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-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml index 6ccff4c1309..e2aec7f8e1f 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server org.eclipse.jetty.ee9 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 15f56113402..dfde25e05d3 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 @@ -221,7 +221,7 @@ org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.quiche - http3-server,http3-common,http3-qpack,quic-server,quic-common,quic-quiche-common,quic-quiche-jna,quic-quiche-foreign-incubator,jetty-quiche-native + jetty-http3-server,jetty-http3-common,jetty-http3-qpack,jetty-quic-server,jetty-quic-common,jetty-quic-quiche-common,jetty-quic-quiche-jna,jetty-quic-quiche-foreign-incubator,jetty-quiche-native jar ${assembly-directory}/lib/http3 @@ -234,7 +234,7 @@ org.eclipse.jetty.http3 - http3-server + jetty-http3-server jar sources ${source-assembly-directory}/lib/http3 @@ -551,7 +551,7 @@ org.eclipse.jetty.fcgi - fcgi-server + jetty-fcgi-server true @@ -565,11 +565,11 @@ org.eclipse.jetty.http2 - http2-server + jetty-http2-server org.eclipse.jetty.http3 - http3-server + jetty-http3-server org.eclipse.jetty diff --git a/jetty-home/src/main/resources/modules/core-demo.mod b/jetty-home/src/main/resources/modules/core-demos.mod similarity index 100% rename from jetty-home/src/main/resources/modules/core-demo.mod rename to jetty-home/src/main/resources/modules/core-demos.mod diff --git a/jetty-home/src/main/resources/modules/demo.mod b/jetty-home/src/main/resources/modules/demos.mod similarity index 84% rename from jetty-home/src/main/resources/modules/demo.mod rename to jetty-home/src/main/resources/modules/demos.mod index 5ad65cd710e..31b5bd98c53 100644 --- a/jetty-home/src/main/resources/modules/demo.mod +++ b/jetty-home/src/main/resources/modules/demos.mod @@ -15,7 +15,7 @@ https http2 test-keystore work -core-demo -#ee8-demo -ee9-demo -ee10-demo +core-demos +#ee8-demos +ee9-demos +ee10-demos diff --git a/jetty-home/src/main/resources/modules/ee10-demo.mod b/jetty-home/src/main/resources/modules/ee10-demos.mod similarity index 100% rename from jetty-home/src/main/resources/modules/ee10-demo.mod rename to jetty-home/src/main/resources/modules/ee10-demos.mod diff --git a/jetty-home/src/main/resources/modules/ee9-demo.mod b/jetty-home/src/main/resources/modules/ee9-demos.mod similarity index 100% rename from jetty-home/src/main/resources/modules/ee9-demo.mod rename to jetty-home/src/main/resources/modules/ee9-demos.mod diff --git a/pom.xml b/pom.xml index 232ed56c25d..b1eecff6426 100644 --- a/pom.xml +++ b/pom.xml @@ -1361,12 +1361,12 @@ org.eclipse.jetty.fcgi - fcgi-client + jetty-fcgi-client ${project.version} org.eclipse.jetty.fcgi - fcgi-server + jetty-fcgi-server ${project.version} @@ -1376,52 +1376,52 @@ 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} org.eclipse.jetty.http3 - http3-client + jetty-http3-client ${project.version} org.eclipse.jetty.http3 - http3-common + jetty-http3-common ${project.version} org.eclipse.jetty.http3 - http3-qpack + jetty-http3-qpack ${project.version} org.eclipse.jetty.http3 - http3-http-client-transport + jetty-http3-client-transport ${project.version} org.eclipse.jetty.http3 - http3-server + jetty-http3-server ${project.version} @@ -1457,32 +1457,32 @@ org.eclipse.jetty.quic - quic-client + jetty-quic-client ${project.version} org.eclipse.jetty.quic - quic-common + jetty-quic-common ${project.version} org.eclipse.jetty.quic - quic-quiche-common + jetty-quic-quiche-common ${project.version} org.eclipse.jetty.quic - quic-quiche-jna + jetty-quic-quiche-jna ${project.version} org.eclipse.jetty.quic - quic-quiche-foreign-incubator + jetty-quic-quiche-foreign-incubator ${project.version} org.eclipse.jetty.quic - quic-server + jetty-quic-server ${project.version} @@ -1502,17 +1502,17 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client ${project.version} org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common ${project.version} org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server ${project.version} diff --git a/tests/test-distribution/test-distribution-common/pom.xml b/tests/test-distribution/test-distribution-common/pom.xml index d1ebba2a1dc..1847100740c 100644 --- a/tests/test-distribution/test-distribution-common/pom.xml +++ b/tests/test-distribution/test-distribution-common/pom.xml @@ -81,12 +81,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-jpms/test-jpms-websocket-core/pom.xml b/tests/test-jpms/test-jpms-websocket-core/pom.xml index 73c8eda32ba..dc2128b2d1e 100644 --- a/tests/test-jpms/test-jpms-websocket-core/pom.xml +++ b/tests/test-jpms/test-jpms-websocket-core/pom.xml @@ -13,11 +13,11 @@ org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client