diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config/modules/unixsocket.mod b/jetty-unixsocket/jetty-unixsocket-server/src/main/config/modules/unixsocket.mod index 23b76ff894c..98e15b325a2 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config/modules/unixsocket.mod +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config/modules/unixsocket.mod @@ -34,7 +34,8 @@ maven://com.github.jnr/jnr-enxio/0.20|lib/jnr/jnr-enxio-0.20.jar maven://com.github.jnr/jnr-posix/3.0.47|lib/jnr/jnr-posix-3.0.47.jar [lib] -lib/jetty-unixsocket-${jetty.version}.jar +lib/jetty-unixsocket-common-${jetty.version}.jar +lib/jetty-unixsocket-server-${jetty.version}.jar lib/jnr/*.jar [license] diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index df0e43a98db..f6b31cb7895 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -80,6 +80,12 @@ jetty-test-helper test + + org.eclipse.jetty + jetty-unixsocket-server + ${project.version} + test + org.eclipse.jetty jetty-unixsocket-client diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index 859efe14968..29c2fdeb92b 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -29,8 +29,8 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http2.client.HTTP2Client; import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; -import org.eclipse.jetty.unixsocket.UnixSocketConnector; import org.eclipse.jetty.unixsocket.client.HttpClientTransportOverUnixSockets; +import org.eclipse.jetty.unixsocket.server.UnixSocketConnector; import org.eclipse.jetty.util.StringUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnJre; @@ -252,7 +252,7 @@ public class DistributionTests extends AbstractDistributionTest { assertTrue(run2.awaitConsoleLogsFor("Started @", 10, TimeUnit.SECONDS)); - startHttpClient(() -> new HttpClient( new HttpClientTransportOverUnixSockets(sockFile.toString()), null)); + startHttpClient(() -> new HttpClient(new HttpClientTransportOverUnixSockets(sockFile.toString()))); ContentResponse response = client.GET("http://localhost/test/index.jsp"); assertEquals(HttpStatus.OK_200, response.getStatus()); assertThat(response.getContentAsString(), containsString("Hello"));