From 62ee077b7967a1f6ecc9c5d66827c463eea16e3f Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 13 Jul 2020 23:11:09 +1000 Subject: [PATCH] move code of ssl-reload module to jetty-util, move module files to jetty-server Signed-off-by: Lachlan Roberts --- jetty-bom/pom.xml | 5 ---- jetty-home/pom.xml | 5 ---- .../src/main/config/etc/jetty-ssl-reload.xml | 2 +- .../src/main/config/modules/ssl-reload.mod | 0 jetty-ssl-reload/pom.xml | 28 ------------------ .../test/resources/jetty-logging.properties | 4 --- .../jetty/util/ssl}/SslKeyStoreScanner.java | 3 +- pom.xml | 1 - .../jetty/test}/KeystoreReloadTest.java | 3 +- .../src/test/resources/badKeystore | Bin .../src/test/resources/newKeystore | Bin .../src/test/resources/oldKeystore | Bin 12 files changed, 4 insertions(+), 47 deletions(-) rename {jetty-ssl-reload => jetty-server}/src/main/config/etc/jetty-ssl-reload.xml (82%) rename {jetty-ssl-reload => jetty-server}/src/main/config/modules/ssl-reload.mod (100%) delete mode 100644 jetty-ssl-reload/pom.xml delete mode 100644 jetty-ssl-reload/src/test/resources/jetty-logging.properties rename {jetty-ssl-reload/src/main/java/org/eclipse/jetty/ssl/reload => jetty-util/src/main/java/org/eclipse/jetty/util/ssl}/SslKeyStoreScanner.java (98%) rename {jetty-ssl-reload/src/test/java/org/eclipse/jetty/ssl/reload => tests/test-integration/src/test/java/org/eclipse/jetty/test}/KeystoreReloadTest.java (98%) rename {jetty-ssl-reload => tests/test-integration}/src/test/resources/badKeystore (100%) rename {jetty-ssl-reload => tests/test-integration}/src/test/resources/newKeystore (100%) rename {jetty-ssl-reload => tests/test-integration}/src/test/resources/oldKeystore (100%) diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index fce0b3898ea..e9e87d39d8f 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -344,11 +344,6 @@ jetty-webapp 9.4.31-SNAPSHOT - - org.eclipse.jetty - jetty-ssl-reload - 9.4.31-SNAPSHOT - org.eclipse.jetty.websocket javax-websocket-client-impl diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 98b792cbb80..44a984c40ac 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -768,11 +768,6 @@ jetty-nosql ${project.version} - - org.eclipse.jetty - jetty-ssl-reload - ${project.version} - diff --git a/jetty-ssl-reload/src/main/config/etc/jetty-ssl-reload.xml b/jetty-server/src/main/config/etc/jetty-ssl-reload.xml similarity index 82% rename from jetty-ssl-reload/src/main/config/etc/jetty-ssl-reload.xml rename to jetty-server/src/main/config/etc/jetty-ssl-reload.xml index 9e3c771abf9..7520ee85378 100644 --- a/jetty-ssl-reload/src/main/config/etc/jetty-ssl-reload.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl-reload.xml @@ -4,7 +4,7 @@ - + diff --git a/jetty-ssl-reload/src/main/config/modules/ssl-reload.mod b/jetty-server/src/main/config/modules/ssl-reload.mod similarity index 100% rename from jetty-ssl-reload/src/main/config/modules/ssl-reload.mod rename to jetty-server/src/main/config/modules/ssl-reload.mod diff --git a/jetty-ssl-reload/pom.xml b/jetty-ssl-reload/pom.xml deleted file mode 100644 index 198cffa8b32..00000000000 --- a/jetty-ssl-reload/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.jetty - jetty-project - 9.4.31-SNAPSHOT - - 4.0.0 - jetty-ssl-reload - Jetty :: SSL Reload - - - ${project.groupId}.ssl.reload - - - - - org.eclipse.jetty - jetty-util - ${project.version} - - - org.eclipse.jetty - jetty-server - ${project.version} - test - - - diff --git a/jetty-ssl-reload/src/test/resources/jetty-logging.properties b/jetty-ssl-reload/src/test/resources/jetty-logging.properties deleted file mode 100644 index 6af29424dc1..00000000000 --- a/jetty-ssl-reload/src/test/resources/jetty-logging.properties +++ /dev/null @@ -1,4 +0,0 @@ -org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog -org.eclipse.jetty.deploy.LEVEL=WARN -org.eclipse.jetty.util.Scanner=WARN -org.eclipse.jetty.ssl.reload.LEVEL=DEBUG diff --git a/jetty-ssl-reload/src/main/java/org/eclipse/jetty/ssl/reload/SslKeyStoreScanner.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslKeyStoreScanner.java similarity index 98% rename from jetty-ssl-reload/src/main/java/org/eclipse/jetty/ssl/reload/SslKeyStoreScanner.java rename to jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslKeyStoreScanner.java index f96b1e0e64f..b6224151fff 100644 --- a/jetty-ssl-reload/src/main/java/org/eclipse/jetty/ssl/reload/SslKeyStoreScanner.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslKeyStoreScanner.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.ssl.reload; +package org.eclipse.jetty.util.ssl; import java.io.File; import java.net.URI; @@ -29,7 +29,6 @@ import org.eclipse.jetty.util.annotation.ManagedOperation; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.util.ssl.SslContextFactory; public class SslKeyStoreScanner extends AbstractLifeCycle implements Scanner.DiscreteListener { diff --git a/pom.xml b/pom.xml index 2bddbcb1b63..ca03a78b827 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,6 @@ jetty-server jetty-xml jetty-security - jetty-ssl-reload jetty-openid jetty-servlet jetty-webapp diff --git a/jetty-ssl-reload/src/test/java/org/eclipse/jetty/ssl/reload/KeystoreReloadTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/KeystoreReloadTest.java similarity index 98% rename from jetty-ssl-reload/src/test/java/org/eclipse/jetty/ssl/reload/KeystoreReloadTest.java rename to tests/test-integration/src/test/java/org/eclipse/jetty/test/KeystoreReloadTest.java index caf59538852..6197aeaf829 100644 --- a/jetty-ssl-reload/src/test/java/org/eclipse/jetty/ssl/reload/KeystoreReloadTest.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/KeystoreReloadTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.ssl.reload; +package org.eclipse.jetty.test; import java.net.URL; import java.nio.file.Files; @@ -44,6 +44,7 @@ import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; import org.eclipse.jetty.util.log.StacklessLogging; import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.eclipse.jetty.util.ssl.SslKeyStoreScanner; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jetty-ssl-reload/src/test/resources/badKeystore b/tests/test-integration/src/test/resources/badKeystore similarity index 100% rename from jetty-ssl-reload/src/test/resources/badKeystore rename to tests/test-integration/src/test/resources/badKeystore diff --git a/jetty-ssl-reload/src/test/resources/newKeystore b/tests/test-integration/src/test/resources/newKeystore similarity index 100% rename from jetty-ssl-reload/src/test/resources/newKeystore rename to tests/test-integration/src/test/resources/newKeystore diff --git a/jetty-ssl-reload/src/test/resources/oldKeystore b/tests/test-integration/src/test/resources/oldKeystore similarity index 100% rename from jetty-ssl-reload/src/test/resources/oldKeystore rename to tests/test-integration/src/test/resources/oldKeystore