Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8454 from eclipse/jetty-12.0.x-module-renaming 

Jetty 12.0.x module renaming
This commit is contained in:
Simone Bordet 2022-08-12 17:32:31 +02:00 committed by GitHub
parent 44a37746e6 6f0f8854de
commit 602b07695a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
755 changed files with 466 additions and 666 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
documentation/jetty-documentation/pom.xml
View File

@ -198,23 +198,23 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-client</artifactId>
<artifactId>jetty-fcgi-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<artifactId>jetty-http2-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-http-client-transport</artifactId>
<artifactId>jetty-http2-client-transport</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-server</artifactId>
<artifactId>jetty-http3-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-http-client-transport</artifactId>
<artifactId>jetty-http3-client-transport</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

2
documentation/jetty-documentation/src/main/asciidoc/programming-guide/client/http2/client-http2.adoc
View File

@ -31,7 +31,7 @@ The Maven artifact coordinates for the HTTP/2 client library are the following:
----
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
<artifactId>jetty-http2-client</artifactId>
<version>{version}</version>
</dependency>
----

2
documentation/jetty-documentation/src/main/asciidoc/programming-guide/client/http3/client-http3.adoc
View File

@ -31,7 +31,7 @@ The Maven artifact coordinates for the HTTP/3 client library are the following:
----
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-client</artifactId>
<artifactId>jetty-http3-client</artifactId>
<version>{version}</version>
</dependency>
----

2
documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/http2/server-http2.adoc
View File

@ -29,7 +29,7 @@ The Maven artifact coordinates for the HTTP/2 client library are the following:
----
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<artifactId>jetty-http2-server</artifactId>
<version>{version}</version>
</dependency>
----

2
documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/http3/server-http3.adoc
View File

@ -29,7 +29,7 @@ The Maven artifact coordinates for the HTTP/3 client library are the following:
----
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-server</artifactId>
<artifactId>jetty-http3-server</artifactId>
<version>{version}</version>
</dependency>
----

6
documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java
View File

@ -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;

4
documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/websocket/WebSocketClientDocs.java
View File

@ -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")

3
documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/HandlerDocs.java
View File

@ -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

32
javadoc/pom.xml
View File

@ -135,17 +135,7 @@
<doctitle>Eclipse Jetty API Doc - v${project.version}</doctitle>
<windowtitle>Eclipse Jetty API Doc - v${project.version}</windowtitle>
<excludePackageNames>
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;
</excludePackageNames>
</configuration>
</execution>
@ -217,12 +207,12 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-client</artifactId>
<artifactId>jetty-fcgi-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-server</artifactId>
<artifactId>jetty-fcgi-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@ -237,32 +227,32 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
<artifactId>jetty-http2-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-http-client-transport</artifactId>
<artifactId>jetty-http2-client-transport</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<artifactId>jetty-http2-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-client</artifactId>
<artifactId>jetty-http3-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-http-client-transport</artifactId>
<artifactId>jetty-http3-client-transport</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-server</artifactId>
<artifactId>jetty-http3-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@ -297,12 +287,12 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-client</artifactId>
<artifactId>jetty-quic-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-server</artifactId>
<artifactId>jetty-quic-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

42
jetty-bom/pom.xml
View File

@ -117,12 +117,12 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-client</artifactId>
<artifactId>jetty-fcgi-client</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-server</artifactId>
<artifactId>jetty-fcgi-server</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@ -149,52 +149,52 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
<artifactId>jetty-http2-client</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-common</artifactId>
<artifactId>jetty-http2-common</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-hpack</artifactId>
<artifactId>jetty-http2-hpack</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-http-client-transport</artifactId>
<artifactId>jetty-http2-client-transport</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<artifactId>jetty-http2-server</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-client</artifactId>
<artifactId>jetty-http3-client</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-common</artifactId>
<artifactId>jetty-http3-common</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-http-client-transport</artifactId>
<artifactId>jetty-http3-client-transport</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-qpack</artifactId>
<artifactId>jetty-http3-qpack</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-server</artifactId>
<artifactId>jetty-http3-server</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@ -294,27 +294,27 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-client</artifactId>
<artifactId>jetty-quic-client</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-common</artifactId>
<artifactId>jetty-quic-common</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-quiche-common</artifactId>
<artifactId>jetty-quic-quiche-common</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-quiche-jna</artifactId>
<artifactId>jetty-quic-quiche-jna</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-server</artifactId>
<artifactId>jetty-quic-server</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@ -449,17 +449,17 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-core-common</artifactId>
<artifactId>jetty-websocket-core-common</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-core-client</artifactId>
<artifactId>jetty-websocket-core-client</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-core-server</artifactId>
<artifactId>jetty-websocket-core-server</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@ -480,7 +480,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-quiche-foreign-incubator</artifactId>
<artifactId>jetty-quic-quiche-foreign-incubator</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
</dependencies>

2
jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
View File

@ -30,7 +30,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
<artifactId>jetty-http2-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>

6
jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
View File

@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<artifactId>jetty-http2-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@ -53,12 +53,12 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
<artifactId>jetty-http2-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-http-client-transport</artifactId>
<artifactId>jetty-http2-client-transport</artifactId>
<scope>test</scope>
</dependency>

2
jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java
View File

@ -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;

2
jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml
View File

@ -46,7 +46,7 @@
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
<artifactId>jetty-http2-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>

2
jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml
View File

@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<artifactId>jetty-http2-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>

42
jetty-core/jetty-bom/pom.xml
View File

@ -97,12 +97,12 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-client</artifactId>
<artifactId>jetty-fcgi-client</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-server</artifactId>
<artifactId>jetty-fcgi-server</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@ -129,52 +129,52 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
<artifactId>jetty-http2-client</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-common</artifactId>
<artifactId>jetty-http2-common</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-hpack</artifactId>
<artifactId>jetty-http2-hpack</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-http-client-transport</artifactId>
<artifactId>jetty-http2-client-transport</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<artifactId>jetty-http2-server</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-client</artifactId>
<artifactId>jetty-http3-client</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-common</artifactId>
<artifactId>jetty-http3-common</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-http-client-transport</artifactId>
<artifactId>jetty-http3-client-transport</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-qpack</artifactId>
<artifactId>jetty-http3-qpack</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-server</artifactId>
<artifactId>jetty-http3-server</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@ -244,27 +244,27 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-client</artifactId>
<artifactId>jetty-quic-client</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-common</artifactId>
<artifactId>jetty-quic-common</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-quiche-common</artifactId>
<artifactId>jetty-quic-quiche-common</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-quiche-jna</artifactId>
<artifactId>jetty-quic-quiche-jna</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-server</artifactId>
<artifactId>jetty-quic-server</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@ -315,17 +315,17 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-core-common</artifactId>
<artifactId>jetty-websocket-core-common</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-core-client</artifactId>
<artifactId>jetty-websocket-core-client</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-core-server</artifactId>
<artifactId>jetty-websocket-core-server</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@ -346,7 +346,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>quic-quiche-foreign-incubator</artifactId>
<artifactId>jetty-quic-quiche-foreign-incubator</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
</dependencies>

20
jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/core-demo.d/core-demo.xml
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- ==================================================================
Configure and deploy the test web application
===================================================================== -->
<Configure id="coreDemo" class="org.eclipse.jetty.server.handler.ContextHandler">
<Set name="handler">
<New class="org.eclipse.jetty.core.demo.HandlerDocs$RootHandler">
<Call name="addHandler"><Arg><New class="org.eclipse.jetty.core.demo.HandlerDocs$HelloHandler0"/></Arg></Call>
<Call name="addHandler"><Arg><New class="org.eclipse.jetty.core.demo.HandlerDocs$HelloHandler1"/></Arg></Call>
<Call name="addHandler"><Arg><New class="org.eclipse.jetty.core.demo.HandlerDocs$HelloHandler2"/></Arg></Call>
<Call name="addHandler"><Arg><New class="org.eclipse.jetty.core.demo.HandlerDocs$HelloHandler3"/></Arg></Call>
<Call name="addHandler"><Arg><New class="org.eclipse.jetty.core.demo.HandlerDocs$HelloHandler4"/></Arg></Call>
<Call name="addHandler"><Arg><New class="org.eclipse.jetty.core.demo.HandlerDocs$HelloHandler5"/></Arg></Call>
<Call name="addHandler"><Arg><New class="org.eclipse.jetty.core.demo.HandlerDocs$EchoHandler"/></Arg></Call>
</New>
</Set>
</Configure>

8
jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<Configure id="helloDemo" class="org.eclipse.jetty.server.handler.ContextHandler">
<Set name="handler">
<New class="org.eclipse.jetty.demo.HelloHandler" />
</Set>
</Configure>

208
jetty-core/jetty-demos/jetty-demo-handler/src/main/java/org/eclipse/jetty/core/demo/HandlerDocs.java
View File

@ -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<Content.Chunk>
{
@Override
public void subscribe(Flow.Subscriber<? super Content.Chunk> subscriber)
{
final SerializedInvoker invoker = new SerializedInvoker();
final Queue<Content.Chunk> 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("<h2>Handler Demos</h2>\n<ul>\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("<li><a href=\"")
.append(URIUtil.addPaths(request.getContext().getContextPath(), path))
.append("\">")
.append(name)
.append("</a></li>\n");
}
index.append("</ul>");
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);
};
}
}
}

33
jetty-core/jetty-demos/jetty-demo-handler/src/main/java/org/eclipse/jetty/demo/HelloHandler.java Normal file
View File

@ -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);
};
}
}

4
jetty-core/jetty-fcgi/fcgi-client/pom.xml → jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml
View File

@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi</artifactId>
<artifactId>jetty-fcgi</artifactId>
<version>12.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>fcgi-client</artifactId>
<artifactId>jetty-fcgi-client</artifactId>
<name>Jetty Core :: FastCGI :: Client</name>
<properties>

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/module-info.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/module-info.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/FCGI.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/FCGI.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpChannelOverFCGI.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpChannelOverFCGI.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpReceiverOverFCGI.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpReceiverOverFCGI.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpSenderOverFCGI.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpSenderOverFCGI.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java → jetty-core/jetty-fcgi/jetty-fcgi-client/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java
View File

0
jetty-core/jetty-fcgi/fcgi-client/src/test/resources/jetty-logging.properties → jetty-core/jetty-fcgi/jetty-fcgi-client/src/test/resources/jetty-logging.properties
View File

8
jetty-core/jetty-fcgi/fcgi-server/pom.xml → jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml
View File

@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi</artifactId>
<artifactId>jetty-fcgi</artifactId>
<version>12.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>fcgi-server</artifactId>
<artifactId>jetty-fcgi-server</artifactId>
<name>Jetty Core :: FastCGI :: Server</name>
<properties>
@ -26,7 +26,7 @@
</dependency>-->
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-client</artifactId>
<artifactId>jetty-fcgi-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<artifactId>jetty-http2-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>

0
jetty-core/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod → jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/config/modules/fcgi.mod
View File

0
jetty-core/jetty-fcgi/fcgi-server/src/main/java/module-info.java → jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/module-info.java
View File

0
jetty-core/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/ServerFCGIConnectionFactory.java → jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/ServerFCGIConnectionFactory.java
View File

0
jetty-core/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/HttpStreamOverFCGI.java → jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/HttpStreamOverFCGI.java
View File

0
jetty-core/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java → jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java
View File

0
jetty-core/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java → jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java
View File

0
jetty-core/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/ExternalFastCGIServerTest.java → jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/ExternalFastCGIServerTest.java
View File

0
jetty-core/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java → jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
View File

0
jetty-core/jetty-fcgi/fcgi-server/src/test/resources/jetty-logging.properties → jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/resources/jetty-logging.properties
View File

0
jetty-core/jetty-fcgi/fcgi-server/src/test/resources/keystore.p12 → jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/resources/keystore.p12
View File

8
jetty-core/jetty-fcgi/pom.xml
View File

@ -8,13 +8,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi</artifactId>
<artifactId>jetty-fcgi</artifactId>
<packaging>pom</packaging>
<name>Jetty Core :: FastCGI :: Parent</name>
<name>Jetty Core :: FastCGI</name>
<modules>
<module>fcgi-client</module>
<module>fcgi-server</module>
<module>jetty-fcgi-client</module>
<module>jetty-fcgi-server</module>
</modules>
<dependencies>

8
jetty-core/jetty-http2/http2-http-client-transport/pom.xml → jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml
View File

@ -2,13 +2,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2</artifactId>
<artifactId>jetty-http2</artifactId>
<version>12.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>http2-http-client-transport</artifactId>
<name>Jetty Core :: HTTP2 :: HTTP Client Transport</name>
<artifactId>jetty-http2-client-transport</artifactId>
<name>Jetty Core :: HTTP2 :: Client Transport</name>
<properties>
<bundle-symbolic-name>${project.groupId}.client.http</bundle-symbolic-name>
@ -21,7 +21,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
<artifactId>jetty-http2-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

2
jetty-core/jetty-http2/http2-http-client-transport/src/main/java/module-info.java → jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/module-info.java
View File

@ -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;
}

6
jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/ClientConnectionFactoryOverHTTP2.java → jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/ClientConnectionFactoryOverHTTP2.java
View File

@ -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;

6
jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpClientTransportOverHTTP2.java → jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/HttpClientTransportOverHTTP2.java
View File

@ -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;

2
jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/ClientHTTP2StreamEndPoint.java → jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/ClientHTTP2StreamEndPoint.java
View File

@ -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;

2
jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HTTPSessionListenerPromise.java → jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HTTPSessionListenerPromise.java
View File

@ -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;

2
jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpChannelOverHTTP2.java → jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpChannelOverHTTP2.java
View File

@ -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;

2
jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpConnectionOverHTTP2.java → jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpConnectionOverHTTP2.java
View File

@ -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;

2
jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpReceiverOverHTTP2.java → jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpReceiverOverHTTP2.java
View File

@ -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;

2
jetty-core/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/internal/HttpSenderOverHTTP2.java → jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpSenderOverHTTP2.java
View File

@ -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;

6
jetty-core/jetty-http2/http2-client/pom.xml → jetty-core/jetty-http2/jetty-http2-client/pom.xml
View File

@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2</artifactId>
<artifactId>jetty-http2</artifactId>
<version>12.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>http2-client</artifactId>
<artifactId>jetty-http2-client</artifactId>
<name>Jetty Core :: HTTP2 :: Client</name>
<properties>
@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-common</artifactId>
<artifactId>jetty-http2-common</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

0
jetty-core/jetty-http2/http2-client/src/main/java/module-info.java → jetty-core/jetty-http2/jetty-http2-client/src/main/java/module-info.java
View File

0
jetty-core/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2Client.java → jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2Client.java
View File

0
jetty-core/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientConnectionFactory.java → jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientConnectionFactory.java
View File

0
jetty-core/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/internal/HTTP2ClientSession.java → jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/internal/HTTP2ClientSession.java
View File

6
jetty-core/jetty-http2/http2-common/pom.xml → jetty-core/jetty-http2/jetty-http2-common/pom.xml
View File

@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2</artifactId>
<artifactId>jetty-http2</artifactId>
<version>12.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>http2-common</artifactId>
<artifactId>jetty-http2-common</artifactId>
<name>Jetty Core :: HTTP2 :: Common</name>
<properties>
@ -17,7 +17,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-hpack</artifactId>
<artifactId>jetty-http2-hpack</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

0
jetty-core/jetty-http2/http2-common/src/main/java/module-info.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/module-info.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/AbstractFlowControlStrategy.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/AbstractFlowControlStrategy.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/BufferingFlowControlStrategy.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/BufferingFlowControlStrategy.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/CloseState.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/CloseState.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/FlowControlStrategy.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/FlowControlStrategy.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Cipher.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Cipher.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/RateControl.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/RateControl.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/SimpleFlowControlStrategy.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/SimpleFlowControlStrategy.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/WindowRateControl.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/WindowRateControl.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/api/Session.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Session.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/api/Stream.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Stream.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/api/server/ServerSessionListener.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/server/ServerSessionListener.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/ContinuationFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/ContinuationFrame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/DataFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/DataFrame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/DisconnectFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/DisconnectFrame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/FailureFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/FailureFrame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/Frame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/Frame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/FrameType.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/FrameType.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/GoAwayFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/GoAwayFrame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/HeadersFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/HeadersFrame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/PingFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/PingFrame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/PrefaceFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/PrefaceFrame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/PriorityFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/PriorityFrame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/PushPromiseFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/PushPromiseFrame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/ResetFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/ResetFrame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/SettingsFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/SettingsFrame.java
View File

0
jetty-core/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/StreamFrame.java → jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/frames/StreamFrame.java
View File

Some files were not shown because too many files have changed in this diff Show More