From 11c364289247c95d1052de1a7ec219aa9fd1c157 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 11 Aug 2022 10:08:11 +0200 Subject: [PATCH] Jetty 12 module renaming - jetty-fcgi. Signed-off-by: Simone Bordet --- documentation/jetty-documentation/pom.xml | 2 +- javadoc/pom.xml | 4 ++-- jetty-bom/pom.xml | 4 ++-- jetty-core/jetty-bom/pom.xml | 4 ++-- .../{fcgi-client => jetty-fcgi-client}/pom.xml | 4 ++-- .../src/main/java/module-info.java | 0 .../src/main/java/org/eclipse/jetty/fcgi/FCGI.java | 0 .../jetty/fcgi/client/http/HttpChannelOverFCGI.java | 0 .../client/http/HttpClientTransportOverFCGI.java | 0 .../fcgi/client/http/HttpConnectionOverFCGI.java | 0 .../fcgi/client/http/HttpReceiverOverFCGI.java | 0 .../jetty/fcgi/client/http/HttpSenderOverFCGI.java | 0 .../jetty/fcgi/generator/ClientGenerator.java | 0 .../org/eclipse/jetty/fcgi/generator/Flusher.java | 0 .../org/eclipse/jetty/fcgi/generator/Generator.java | 0 .../jetty/fcgi/generator/ServerGenerator.java | 0 .../fcgi/parser/BeginRequestContentParser.java | 0 .../org/eclipse/jetty/fcgi/parser/ClientParser.java | 0 .../eclipse/jetty/fcgi/parser/ContentParser.java | 0 .../jetty/fcgi/parser/EndRequestContentParser.java | 0 .../org/eclipse/jetty/fcgi/parser/HeaderParser.java | 0 .../jetty/fcgi/parser/ParamsContentParser.java | 0 .../java/org/eclipse/jetty/fcgi/parser/Parser.java | 0 .../jetty/fcgi/parser/ResponseContentParser.java | 0 .../org/eclipse/jetty/fcgi/parser/ServerParser.java | 0 .../jetty/fcgi/parser/StreamContentParser.java | 0 .../jetty/fcgi/generator/ClientGeneratorTest.java | 0 .../eclipse/jetty/fcgi/parser/ClientParserTest.java | 0 .../src/test/resources/jetty-logging.properties | 0 .../{fcgi-server => jetty-fcgi-server}/pom.xml | 6 +++--- .../src/main/config/modules/fcgi.mod | 0 .../src/main/java/module-info.java | 0 .../fcgi/server/ServerFCGIConnectionFactory.java | 0 .../fcgi/server/internal/HttpStreamOverFCGI.java | 0 .../fcgi/server/internal/ServerFCGIConnection.java | 0 .../fcgi/server/AbstractHttpClientServerTest.java | 0 .../fcgi/server/ExternalFastCGIServerTest.java | 0 .../eclipse/jetty/fcgi/server/HttpClientTest.java | 0 .../src/test/resources/jetty-logging.properties | 0 .../src/test/resources/keystore.p12 | Bin jetty-core/jetty-fcgi/pom.xml | 8 ++++---- .../jetty-ee10-test-http-client-transport/pom.xml | 2 +- jetty-ee9/jetty-ee9-fcgi-server-proxy/pom.xml | 2 +- .../jetty-ee9-test-http-client-transport/pom.xml | 2 +- jetty-home/pom.xml | 2 +- pom.xml | 4 ++-- 46 files changed, 22 insertions(+), 22 deletions(-) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/pom.xml (94%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/module-info.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/FCGI.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpChannelOverFCGI.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpReceiverOverFCGI.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpSenderOverFCGI.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java (100%) rename jetty-core/jetty-fcgi/{fcgi-client => jetty-fcgi-client}/src/test/resources/jetty-logging.properties (100%) rename jetty-core/jetty-fcgi/{fcgi-server => jetty-fcgi-server}/pom.xml (93%) rename jetty-core/jetty-fcgi/{fcgi-server => jetty-fcgi-server}/src/main/config/modules/fcgi.mod (100%) rename jetty-core/jetty-fcgi/{fcgi-server => jetty-fcgi-server}/src/main/java/module-info.java (100%) rename jetty-core/jetty-fcgi/{fcgi-server => jetty-fcgi-server}/src/main/java/org/eclipse/jetty/fcgi/server/ServerFCGIConnectionFactory.java (100%) rename jetty-core/jetty-fcgi/{fcgi-server => jetty-fcgi-server}/src/main/java/org/eclipse/jetty/fcgi/server/internal/HttpStreamOverFCGI.java (100%) rename jetty-core/jetty-fcgi/{fcgi-server => jetty-fcgi-server}/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java (100%) rename jetty-core/jetty-fcgi/{fcgi-server => jetty-fcgi-server}/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java (100%) rename jetty-core/jetty-fcgi/{fcgi-server => jetty-fcgi-server}/src/test/java/org/eclipse/jetty/fcgi/server/ExternalFastCGIServerTest.java (100%) rename jetty-core/jetty-fcgi/{fcgi-server => jetty-fcgi-server}/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java (100%) rename jetty-core/jetty-fcgi/{fcgi-server => jetty-fcgi-server}/src/test/resources/jetty-logging.properties (100%) rename jetty-core/jetty-fcgi/{fcgi-server => jetty-fcgi-server}/src/test/resources/keystore.p12 (100%) diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index fbf798d7bd5..8e93559f697 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -198,7 +198,7 @@ org.eclipse.jetty.fcgi - fcgi-client + jetty-fcgi-client org.eclipse.jetty.http2 diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 0be1902e172..306b5898914 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -217,12 +217,12 @@ org.eclipse.jetty.fcgi - fcgi-client + jetty-fcgi-client provided org.eclipse.jetty.fcgi - fcgi-server + jetty-fcgi-server provided diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 153870013f4..5e6e5aa1b73 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 diff --git a/jetty-core/jetty-bom/pom.xml b/jetty-core/jetty-bom/pom.xml index e3bcd3847e1..e5b1a8f8dda 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 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 93% rename from jetty-core/jetty-fcgi/fcgi-server/pom.xml rename to jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml index afd60d84c54..fcdc000665a 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 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-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..fcbccfda04c 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 @@ -115,7 +115,7 @@ org.eclipse.jetty.fcgi - fcgi-server + jetty-fcgi-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..900817ea12c 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 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..22d9cab576f 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 @@ -139,7 +139,7 @@ org.eclipse.jetty.fcgi - fcgi-server + jetty-fcgi-server test diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 21d01feb5dd..edbf304f20d 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -548,7 +548,7 @@ org.eclipse.jetty.fcgi - fcgi-server + jetty-fcgi-server true diff --git a/pom.xml b/pom.xml index 232ed56c25d..894e1aa99e0 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}