move code of ssl-reload module to jetty-util, move module files to jetty-server

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

jetty-bom/pom.xml

@@ -344,11 +344,6 @@
         <artifactId>jetty-webapp</artifactId>
         <version>9.4.31-SNAPSHOT</version>
       </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-ssl-reload</artifactId>
-        <version>9.4.31-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
         <artifactId>javax-websocket-client-impl</artifactId>

jetty-home/pom.xml

@@ -768,11 +768,6 @@
       <artifactId>jetty-nosql</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-ssl-reload</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
 
   <profiles>

jetty-server/src/main/config/etc/jetty-ssl-reload.xml

@@ -4,7 +4,7 @@
 
   <Call name="addBean">
     <Arg>
-      <New id="sslKeyStoreScanner" class="org.eclipse.jetty.ssl.reload.SslKeyStoreScanner">
+      <New id="sslKeyStoreScanner" class="org.eclipse.jetty.util.ssl.SslKeyStoreScanner">
         <Arg><Ref refid="sslContextFactory"/></Arg>
         <Set name="scanInterval"><Property name="jetty.ssl.reload.scanInterval" default="1"/></Set>
       </New>

jetty-ssl-reload/pom.xml

@@ -1,28 +0,0 @@
-<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</groupId>
-    <artifactId>jetty-project</artifactId>
-    <version>9.4.31-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jetty-ssl-reload</artifactId>
-  <name>Jetty :: SSL Reload</name>
-
-  <properties>
-    <bundle-symbolic-name>${project.groupId}.ssl.reload</bundle-symbolic-name>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

jetty-ssl-reload/src/test/resources/jetty-logging.properties

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

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
 {

pom.xml

@@ -95,7 +95,6 @@
     <module>jetty-server</module>
     <module>jetty-xml</module>
     <module>jetty-security</module>
-    <module>jetty-ssl-reload</module>
     <module>jetty-openid</module>
     <module>jetty-servlet</module>
     <module>jetty-webapp</module>

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;