From fc9cbda52f6173df73ffe28db8e4cbef0e711932 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 13 Aug 2024 16:06:50 +0300 Subject: [PATCH 1/9] Improved handling of 100 Continue (#12113) * Now `HttpClient` removed the `Expect` header if there is no request content. * Changed AbstractProxyServlet and ProxyHandler check for request content: now the Content-Type header is not taken into consideration. * Now the server avoids sending the 100 Continue response if there is no request content. * Now the request body is not defaulted if missing, but just kept null. Signed-off-by: Simone Bordet --- .../jetty/client/ContinueProtocolHandler.java | 10 ++- .../client/transport/HttpConnection.java | 20 ++--- .../jetty/client/transport/HttpSender.java | 3 +- .../org/eclipse/jetty/proxy/ProxyHandler.java | 9 ++- .../server/internal/HttpChannelState.java | 8 +- .../org/eclipse/jetty/util/StringUtil.java | 32 +------- .../ee10/proxy/AbstractProxyServlet.java | 9 ++- .../jetty/ee10/proxy/ProxyServletTest.java | 79 +++++++++++++++++++ .../transport/HttpClientContinueTest.java | 66 +++++++++++++++- .../jetty/ee9/proxy/AbstractProxyServlet.java | 9 ++- .../jetty/ee9/proxy/ProxyServletTest.java | 79 +++++++++++++++++++ 11 files changed, 261 insertions(+), 63 deletions(-) diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/ContinueProtocolHandler.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/ContinueProtocolHandler.java index 213e0ef2586..86111bc11b8 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/ContinueProtocolHandler.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/ContinueProtocolHandler.java @@ -39,10 +39,14 @@ public class ContinueProtocolHandler implements ProtocolHandler @Override public boolean accept(Request request, Response response) { - boolean is100 = response.getStatus() == HttpStatus.CONTINUE_100; - boolean expect100 = request.getHeaders().contains(HttpHeader.EXPECT, HttpHeaderValue.CONTINUE.asString()); boolean handled100 = request.getAttributes().containsKey(ATTRIBUTE); - return (is100 || expect100) && !handled100; + if (handled100) + return false; + boolean is100 = response.getStatus() == HttpStatus.CONTINUE_100; + if (is100) + return true; + // Also handle non-100 responses, because we need to complete the request to complete the whole exchange. + return request.getHeaders().contains(HttpHeader.EXPECT, HttpHeaderValue.CONTINUE.asString()); } @Override diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpConnection.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpConnection.java index 160ca2649ff..38723867bb2 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpConnection.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpConnection.java @@ -20,7 +20,6 @@ import java.util.concurrent.TimeoutException; import org.eclipse.jetty.client.Authentication; import org.eclipse.jetty.client.AuthenticationStore; -import org.eclipse.jetty.client.BytesRequestContent; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpProxy; import org.eclipse.jetty.client.HttpRequestException; @@ -35,6 +34,7 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.io.CyclicTimeouts; import org.eclipse.jetty.util.Attachable; import org.eclipse.jetty.util.NanoTime; +import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.thread.AutoLock; import org.eclipse.jetty.util.thread.Scheduler; import org.slf4j.Logger; @@ -146,7 +146,7 @@ public abstract class HttpConnection implements IConnection, Attachable // Make sure the path is there String path = request.getPath(); - if (path.trim().length() == 0) + if (StringUtil.isBlank(path)) { path = "/"; request.path(path); @@ -191,11 +191,7 @@ public abstract class HttpConnection implements IConnection, Attachable // Add content headers. Request.Content content = request.getBody(); - if (content == null) - { - request.body(new BytesRequestContent()); - } - else + if (content != null) { if (!headers.contains(HttpHeader.CONTENT_TYPE)) { @@ -203,10 +199,7 @@ public abstract class HttpConnection implements IConnection, Attachable if (contentType == null) contentType = getHttpClient().getDefaultRequestContentType(); if (contentType != null) - { - HttpField field = new HttpField(HttpHeader.CONTENT_TYPE, contentType); - request.addHeader(field); - } + request.addHeader(new HttpField(HttpHeader.CONTENT_TYPE, contentType)); } long contentLength = content.getLength(); if (contentLength >= 0) @@ -215,6 +208,9 @@ public abstract class HttpConnection implements IConnection, Attachable request.addHeader(new HttpField.LongValueHttpField(HttpHeader.CONTENT_LENGTH, contentLength)); } } + // RFC 9110, section 10.1.1. + if (content == null || content.getLength() == 0) + request.headers(h -> h.remove(HttpHeader.EXPECT)); // Cookies. StringBuilder cookies = convertCookies(request.getCookies(), null); @@ -243,7 +239,7 @@ public abstract class HttpConnection implements IConnection, Attachable { if (builder == null) builder = new StringBuilder(); - if (builder.length() > 0) + if (!builder.isEmpty()) builder.append("; "); builder.append(cookie.getName()).append("=").append(cookie.getValue()); } diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java index 43903c1437a..55476b7f48c 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java @@ -528,7 +528,7 @@ public abstract class HttpSender action.run(); // Read the request content. - chunk = content.read(); + chunk = content != null ? content.read() : Content.Chunk.EOF; } if (LOG.isDebugEnabled()) LOG.debug("Content {} for {}", chunk, request); @@ -539,6 +539,7 @@ public abstract class HttpSender { // No content after the headers, demand. demanded = true; + assert content != null; content.demand(this::succeeded); return Action.SCHEDULED; } diff --git a/jetty-core/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyHandler.java b/jetty-core/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyHandler.java index f7223624188..ae4540ca710 100644 --- a/jetty-core/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyHandler.java +++ b/jetty-core/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyHandler.java @@ -393,11 +393,12 @@ public abstract class ProxyHandler extends Handler.Abstract private boolean hasContent(Request clientToProxyRequest) { - if (clientToProxyRequest.getLength() > 0) + long contentLength = clientToProxyRequest.getLength(); + if (contentLength == 0) + return false; + if (contentLength > 0) return true; - HttpFields headers = clientToProxyRequest.getHeaders(); - return headers.get(HttpHeader.CONTENT_TYPE) != null || - headers.get(HttpHeader.TRANSFER_ENCODING) != null; + return clientToProxyRequest.getHeaders().get(HttpHeader.TRANSFER_ENCODING) != null; } private boolean expects100Continue(Request clientToProxyRequest) diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java index e97331b573a..5aa3287355e 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java @@ -1117,8 +1117,6 @@ public class HttpChannelState implements HttpChannel, Components */ public static class ChannelResponse implements Response, Callback { - private static final CompletableFuture UNEXPECTED_100_CONTINUE = CompletableFuture.failedFuture(new IllegalStateException("100 not expected")); - private static final CompletableFuture COMMITTED_100_CONTINUE = CompletableFuture.failedFuture(new IllegalStateException("Committed")); private final ChannelRequest _request; private final ResponseHttpFields _httpFields; protected int _status; @@ -1408,12 +1406,14 @@ public class HttpChannelState implements HttpChannel, Components if (status == HttpStatus.CONTINUE_100) { if (!httpChannelState._expects100Continue) - return UNEXPECTED_100_CONTINUE; + return CompletableFuture.failedFuture(new IllegalStateException("100 not expected")); + if (_request.getLength() == 0) + return CompletableFuture.completedFuture(null); httpChannelState._expects100Continue = false; } if (_httpFields.isCommitted()) - return status == HttpStatus.CONTINUE_100 ? COMMITTED_100_CONTINUE : CompletableFuture.failedFuture(new IllegalStateException("Committed")); + return CompletableFuture.failedFuture(new IllegalStateException("Committed")); if (_writeCallback != null) return CompletableFuture.failedFuture(new WritePendingException()); diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java index 7d30336279e..393500f4001 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java @@ -657,21 +657,7 @@ public class StringUtil */ public static boolean isBlank(String str) { - if (str == null) - { - return true; - } - int len = str.length(); - for (int i = 0; i < len; i++) - { - if (!Character.isWhitespace(str.codePointAt(i))) - { - // found a non-whitespace, we can stop searching now - return false; - } - } - // only whitespace - return true; + return str == null || str.isBlank(); } /** @@ -727,21 +713,7 @@ public class StringUtil */ public static boolean isNotBlank(String str) { - if (str == null) - { - return false; - } - int len = str.length(); - for (int i = 0; i < len; i++) - { - if (!Character.isWhitespace(str.codePointAt(i))) - { - // found a non-whitespace, we can stop searching now - return true; - } - } - // only whitespace - return false; + return !isBlank(str); } public static boolean isHex(String str, int offset, int length) diff --git a/jetty-ee10/jetty-ee10-proxy/src/main/java/org/eclipse/jetty/ee10/proxy/AbstractProxyServlet.java b/jetty-ee10/jetty-ee10-proxy/src/main/java/org/eclipse/jetty/ee10/proxy/AbstractProxyServlet.java index dd7db3f33a0..3bebd249a61 100644 --- a/jetty-ee10/jetty-ee10-proxy/src/main/java/org/eclipse/jetty/ee10/proxy/AbstractProxyServlet.java +++ b/jetty-ee10/jetty-ee10-proxy/src/main/java/org/eclipse/jetty/ee10/proxy/AbstractProxyServlet.java @@ -456,9 +456,12 @@ public abstract class AbstractProxyServlet extends HttpServlet protected boolean hasContent(HttpServletRequest clientRequest) { - return clientRequest.getContentLength() > 0 || - clientRequest.getContentType() != null || - clientRequest.getHeader(HttpHeader.TRANSFER_ENCODING.asString()) != null; + long contentLength = clientRequest.getContentLengthLong(); + if (contentLength == 0) + return false; + if (contentLength > 0) + return true; + return clientRequest.getHeader(HttpHeader.TRANSFER_ENCODING.asString()) != null; } protected boolean expects100Continue(HttpServletRequest request) diff --git a/jetty-ee10/jetty-ee10-proxy/src/test/java/org/eclipse/jetty/ee10/proxy/ProxyServletTest.java b/jetty-ee10/jetty-ee10-proxy/src/test/java/org/eclipse/jetty/ee10/proxy/ProxyServletTest.java index ccd90c8a275..f98ca0d4a35 100644 --- a/jetty-ee10/jetty-ee10-proxy/src/test/java/org/eclipse/jetty/ee10/proxy/ProxyServletTest.java +++ b/jetty-ee10/jetty-ee10-proxy/src/test/java/org/eclipse/jetty/ee10/proxy/ProxyServletTest.java @@ -20,7 +20,9 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.io.Writer; import java.net.ConnectException; +import java.net.InetSocketAddress; import java.nio.ByteBuffer; +import java.nio.channels.SocketChannel; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -80,6 +82,7 @@ import org.eclipse.jetty.http.HttpHeaderValue; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpScheme; import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; @@ -1703,4 +1706,80 @@ public class ProxyServletTest assertEquals(HttpStatus.OK_200, response.getStatus()); } } + + @ParameterizedTest + @MethodSource("impls") + public void testExpect100ContinueContentLengthZero(Class proxyServletClass) throws Exception + { + testExpect100ContinueNoRequestContent(proxyServletClass, false); + } + + @ParameterizedTest + @MethodSource("impls") + public void testExpect100ContinueEmptyChunkedContent(Class proxyServletClass) throws Exception + { + testExpect100ContinueNoRequestContent(proxyServletClass, true); + } + + private void testExpect100ContinueNoRequestContent(Class proxyServletClass, boolean chunked) throws Exception + { + startServer(new HttpServlet() + { + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException + { + // Send the 100 Continue. + ServletInputStream input = request.getInputStream(); + // Echo the content. + IO.copy(input, response.getOutputStream()); + } + }); + startProxy(proxyServletClass); + + String authority = "localhost:" + serverConnector.getLocalPort(); + for (int i = 0; i < 50; i++) + { + try (SocketChannel client = SocketChannel.open(new InetSocketAddress("localhost", proxyConnector.getLocalPort()))) + { + String request; + if (chunked) + { + request = """ + POST http://$A/ HTTP/1.1 + Host: $A + Expect: 100-Continue + Transfer-Encoding: chunked + + 0 + + """; + } + else + { + request = """ + POST http://$A/ HTTP/1.1 + Host: $A + Expect: 100-Continue + Content-Length: 0 + + """; + } + request = request.replace("$A", authority); + client.write(StandardCharsets.UTF_8.encode(request)); + + HttpTester.Input input = HttpTester.from(client); + HttpTester.Response response1 = HttpTester.parseResponse(input); + if (chunked) + { + assertEquals(HttpStatus.CONTINUE_100, response1.getStatus()); + HttpTester.Response response2 = HttpTester.parseResponse(input); + assertEquals(HttpStatus.OK_200, response2.getStatus()); + } + else + { + assertEquals(HttpStatus.OK_200, response1.getStatus()); + } + } + } + } } diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/src/test/java/org/eclipse/jetty/ee10/test/client/transport/HttpClientContinueTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/src/test/java/org/eclipse/jetty/ee10/test/client/transport/HttpClientContinueTest.java index 11b33f6cc8b..4626f0a7f5d 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/src/test/java/org/eclipse/jetty/ee10/test/client/transport/HttpClientContinueTest.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/src/test/java/org/eclipse/jetty/ee10/test/client/transport/HttpClientContinueTest.java @@ -22,6 +22,7 @@ import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.Socket; import java.nio.ByteBuffer; +import java.nio.channels.SocketChannel; import java.nio.charset.StandardCharsets; import java.util.EnumSet; import java.util.Random; @@ -45,11 +46,13 @@ import org.eclipse.jetty.client.ContinueProtocolHandler; import org.eclipse.jetty.client.Request; import org.eclipse.jetty.client.Response; import org.eclipse.jetty.client.Result; +import org.eclipse.jetty.client.StringRequestContent; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpHeaderValue; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpTester; +import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; import org.junit.jupiter.api.Test; @@ -163,7 +166,6 @@ public class HttpClientContinueTest extends AbstractTest .body(content) .timeout(5, TimeUnit.SECONDS) .send(); - } assertNotNull(response); @@ -233,14 +235,14 @@ public class HttpClientContinueTest extends AbstractTest @MethodSource("transportsNoFCGI") public void testExpect100ContinueWithContentRespond417ExpectationFailed(Transport transport) throws Exception { - testExpect100ContinueWithContentRespondError(transport, 417); + testExpect100ContinueWithContentRespondError(transport, HttpStatus.EXPECTATION_FAILED_417); } @ParameterizedTest @MethodSource("transportsNoFCGI") public void testExpect100ContinueWithContentRespond413RequestEntityTooLarge(Transport transport) throws Exception { - testExpect100ContinueWithContentRespondError(transport, 413); + testExpect100ContinueWithContentRespondError(transport, HttpStatus.PAYLOAD_TOO_LARGE_413); } private void testExpect100ContinueWithContentRespondError(Transport transport, int error) throws Exception @@ -796,6 +798,64 @@ public class HttpClientContinueTest extends AbstractTest assertTrue(clientLatch.await(5, TimeUnit.SECONDS)); } + @ParameterizedTest + @MethodSource("transportsNoFCGI") + public void testExpect100ContinueWithContentLengthZeroExpectIsRemoved(Transport transport) throws Exception + { + start(transport, new HttpServlet() + { + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) + { + assertEquals(0, request.getContentLengthLong()); + // The Expect header must have been removed by the client. + assertNull(request.getHeader(HttpHeader.EXPECT.asString())); + } + }); + + ContentResponse response = client.newRequest(newURI(transport)) + .headers(headers -> headers.put(HttpHeader.EXPECT, HttpHeaderValue.CONTINUE.asString())) + .body(new StringRequestContent("")) + .timeout(5, TimeUnit.SECONDS) + .send(); + + assertEquals(HttpStatus.OK_200, response.getStatus()); + } + + @Test + public void testExpect100ContinueWithContentLengthZero() throws Exception + { + startServer(Transport.HTTP, new HttpServlet() + { + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException + { + assertEquals(0, request.getContentLengthLong()); + assertNotNull(request.getHeader(HttpHeader.EXPECT.asString())); + + // Trigger the 100-Continue logic. + // The 100 continue will not be sent, since there is no request content. + ServletInputStream input = request.getInputStream(); + assertEquals(-1, input.read()); + } + }); + + try (SocketChannel client = SocketChannel.open(new InetSocketAddress("localhost", ((NetworkConnector)connector).getLocalPort()))) + { + String request = """ + GET / HTTP/1.1 + Host: localhost + Expect: 100-Continue + Content-Length: 0 + + """; + client.write(StandardCharsets.UTF_8.encode(request)); + + HttpTester.Response response = HttpTester.parseResponse(HttpTester.from(client)); + assertEquals(HttpStatus.OK_200, response.getStatus()); + } + } + @Test public void testExpect100ContinueWithTwoResponsesInOneRead() throws Exception { diff --git a/jetty-ee9/jetty-ee9-proxy/src/main/java/org/eclipse/jetty/ee9/proxy/AbstractProxyServlet.java b/jetty-ee9/jetty-ee9-proxy/src/main/java/org/eclipse/jetty/ee9/proxy/AbstractProxyServlet.java index c8a6cd738b9..2827ec39b54 100644 --- a/jetty-ee9/jetty-ee9-proxy/src/main/java/org/eclipse/jetty/ee9/proxy/AbstractProxyServlet.java +++ b/jetty-ee9/jetty-ee9-proxy/src/main/java/org/eclipse/jetty/ee9/proxy/AbstractProxyServlet.java @@ -459,9 +459,12 @@ public abstract class AbstractProxyServlet extends HttpServlet protected boolean hasContent(HttpServletRequest clientRequest) { - return clientRequest.getContentLength() > 0 || - clientRequest.getContentType() != null || - clientRequest.getHeader(HttpHeader.TRANSFER_ENCODING.asString()) != null; + long contentLength = clientRequest.getContentLengthLong(); + if (contentLength == 0) + return false; + if (contentLength > 0) + return true; + return clientRequest.getHeader(HttpHeader.TRANSFER_ENCODING.asString()) != null; } protected boolean expects100Continue(HttpServletRequest request) diff --git a/jetty-ee9/jetty-ee9-proxy/src/test/java/org/eclipse/jetty/ee9/proxy/ProxyServletTest.java b/jetty-ee9/jetty-ee9-proxy/src/test/java/org/eclipse/jetty/ee9/proxy/ProxyServletTest.java index f1d5513df29..e8c48e7ca4f 100644 --- a/jetty-ee9/jetty-ee9-proxy/src/test/java/org/eclipse/jetty/ee9/proxy/ProxyServletTest.java +++ b/jetty-ee9/jetty-ee9-proxy/src/test/java/org/eclipse/jetty/ee9/proxy/ProxyServletTest.java @@ -20,7 +20,9 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.io.Writer; import java.net.ConnectException; +import java.net.InetSocketAddress; import java.nio.ByteBuffer; +import java.nio.channels.SocketChannel; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -79,6 +81,7 @@ import org.eclipse.jetty.http.HttpHeaderValue; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpScheme; import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; @@ -1701,4 +1704,80 @@ public class ProxyServletTest assertEquals(HttpStatus.OK_200, response.getStatus()); } } + + @ParameterizedTest + @MethodSource("impls") + public void testExpect100ContinueContentLengthZero(Class proxyServletClass) throws Exception + { + testExpect100ContinueNoRequestContent(proxyServletClass, false); + } + + @ParameterizedTest + @MethodSource("impls") + public void testExpect100ContinueEmptyChunkedContent(Class proxyServletClass) throws Exception + { + testExpect100ContinueNoRequestContent(proxyServletClass, true); + } + + private void testExpect100ContinueNoRequestContent(Class proxyServletClass, boolean chunked) throws Exception + { + startServer(new HttpServlet() + { + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException + { + // Send the 100 Continue. + ServletInputStream input = request.getInputStream(); + // Echo the content. + IO.copy(input, response.getOutputStream()); + } + }); + startProxy(proxyServletClass); + + String authority = "localhost:" + serverConnector.getLocalPort(); + for (int i = 0; i < 50; i++) + { + try (SocketChannel client = SocketChannel.open(new InetSocketAddress("localhost", proxyConnector.getLocalPort()))) + { + String request; + if (chunked) + { + request = """ + POST http://$A/ HTTP/1.1 + Host: $A + Expect: 100-Continue + Transfer-Encoding: chunked + + 0 + + """; + } + else + { + request = """ + POST http://$A/ HTTP/1.1 + Host: $A + Expect: 100-Continue + Content-Length: 0 + + """; + } + request = request.replace("$A", authority); + client.write(StandardCharsets.UTF_8.encode(request)); + + HttpTester.Input input = HttpTester.from(client); + HttpTester.Response response1 = HttpTester.parseResponse(input); + if (chunked) + { + assertEquals(HttpStatus.CONTINUE_100, response1.getStatus()); + HttpTester.Response response2 = HttpTester.parseResponse(input); + assertEquals(HttpStatus.OK_200, response2.getStatus()); + } + else + { + assertEquals(HttpStatus.OK_200, response1.getStatus()); + } + } + } + } } From cc2cef17320f107150b7a912e1f3983c75b5f58f Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 13 Aug 2024 10:50:40 +0200 Subject: [PATCH 2/9] Fixes #12158 - Jetty12 migration help. Updated documentation with section about migration of Handler code from Jetty 11 to Jetty 12. Signed-off-by: Simone Bordet --- .../pages/migration/11-to-12.adoc | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/documentation/jetty/modules/programming-guide/pages/migration/11-to-12.adoc b/documentation/jetty/modules/programming-guide/pages/migration/11-to-12.adoc index 4e27583344b..02f92c78e3b 100644 --- a/documentation/jetty/modules/programming-guide/pages/migration/11-to-12.adoc +++ b/documentation/jetty/modules/programming-guide/pages/migration/11-to-12.adoc @@ -99,6 +99,15 @@ | `org.eclipse.jetty.websocket.api.**WebSocketPolicy**` | `org.eclipse.jetty.websocket.api.**Configurable**` |=== +== Server-Side Web Application APIs Changes + +Jetty 12 introduced redesigned server-side APIs for web applications. +In Jetty 11, these APIs were based on a mix of Jakarta Servlet APIs and Jetty Handler APIs, while in Jetty 12 they are solely based on Jetty Handler APIs. + +In Jetty 12 you can now write web applications independently of the Servlet APIs, so you can migrate Jakarta Servlets to Jetty Handlers as explained in xref:servlet-to-handler[this section]. + +If you were already using the Jetty 11 Handler APIs, you can migrate them to the Jetty 12 Handler APIs as explained in xref:api-changes-handler[this section]. + [[servlet-to-handler]] == Migrate Servlets to Jetty Handlers @@ -126,6 +135,8 @@ include::code:example$src/main/java/org/eclipse/jetty/docs/programming/migration include::code:example$src/main/java/org/eclipse/jetty/docs/programming/migration/ServletToHandlerDocs.java[tags=requestContent-source] ---- +Refer also to the `Content.Source` APIs detailed in xref:arch/io.adoc#content-source[this section]. + === Handler Response APIs [,java,indent=0] ---- @@ -150,9 +161,48 @@ include::code:example$src/main/java/org/eclipse/jetty/docs/programming/migration include::code:example$src/main/java/org/eclipse/jetty/docs/programming/migration/ServletToHandlerDocs.java[tags=responseContent-trailers] ---- +Refer also to the `Content.Sink` APIs detailed in xref:arch/io.adoc#content-sink[this section]. + [[api-changes]] == APIs Changes +[[api-changes-handler]] +=== `Handler` + +The server-side `Handler` class, and the APIs to use for request/response processing, have been redesigned in Jetty 12. + +The Jetty 11 `Handler` method: + +`Handler.handle(String target, Request jettyRequest, HttpServletRequest request, HttpServletResponse response)` + +has been changed in Jetty 12 to: + +`Handler.handle(Request request, Response response, Callback callback)` + +The Jetty 11 `target` parameter has been removed, and in Jetty 12 it has been replaced by the information present in `Request.getHttpURI()`. + +In Jetty 11, ``Handler``s would mark the fact that they handled the request, and therefore are producing a response, by calling `Request.setHandled(true)`. +In Jetty 12, this is performed by returning `true` from the `Handler.handle(\...)` method, which also requires that the `Callback` parameter must be completed, either by succeeding it or failing it. + +In Jetty 11, the `Handler.handle(\...)` method has a blocking semantic, while in Jetty 12 the `Handler.handle(\...)` method has an asynchronous semantic, thanks to the `Callback` parameter. +This means that you can return from the `Handler.handle(\...)` method _before_ the response has been sent, similarly to what you can do with the Servlet APIs when you call `HttpServletRequest.startAsync()`. +Similarly, in Jetty 11 after a call to `startAsync()` you must call `AsyncContext.complete()`, while in Jetty 12 you must complete the `Callback` parameter, either by succeeding it or failing it. + +In Jetty 11, `AbstractHandler` provides a utility class to implement `Handler`. +In Jetty 12, use `Handler.Abstract`. + +In Jetty 11, the APIs to deal with request or response HTTP headers are based on either Jetty's `HttpFields`, or the Servlet APIs. +In Jetty 12, the HTTP headers API are only based on `HttpFields`. +Please refer to the `HttpFields` link:{javadoc-url}/org/eclipse/jetty/http/HttpFields.html[javadocs] for details. + +In Jetty 11, the request content is accessed via `Request.getInputStream()` or `HttpServletRequest.getInputStream()`. +In Jetty 12, the `Request` object itself _is-a_ `Content.Source` that can be read as explained in xref:arch/io.adoc#content-source[this section]. +In Jetty 12, you can use `Content.Source.asInputStream(request)` to obtain an `InputStream` and minimize the changes to your code, but remember that `InputStream` only provides blocking APIs, while `Content.Source` provides non-blocking APIs. + +In Jetty 11, the response content is accessed via `Response.getOutputStream()` or `HttpServletResponse.getOutputStream()`. +In Jetty 12, the `Response` object itself _is-a_ `Content.Sink` that can be written as explained in xref:arch/io.adoc#content-sink[this section]. +In Jetty 12, you can use `Content.Sink.asOutputStream(response)` to obtain an `OutputStream` and minimize the changes to your code, but remember that `OutputStream` only provides blocking APIs, while `Content.Sink` provides non-blocking APIs. + === `HttpClient` The Jetty 11 `Request.onResponseContentDemanded(Response.DemandedContentListener)` API has been replaced by `Request.onResponseContentSource(Response.ContentSourceListener)` in Jetty 12. @@ -165,6 +215,8 @@ The Jetty 12 model is a "demand+pull" model: when the content is available, the For more information about the new model, see xref:arch/io.adoc#content-source[this section]. +Jetty 12 introduced the concept of low-level transport for high-level protocols, described in xref:client/io-arch.adoc#transport[this section]. + === WebSocket The Jetty WebSocket APIs have been vastly simplified, and brought in line with the style of other APIs. From e7f1512423f7a59bb967779531d32d4faf643561 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 13 Aug 2024 12:15:44 +0200 Subject: [PATCH 3/9] Fixes #3184 - Make LifeCycle implement AutoCloseable. Rather than making LifeCycle AutoCloseable, just implement AutoCloseable in the client components. Update tests to use try-with-resources accordingly. Signed-off-by: Simone Bordet --- .../java/client/ConscryptHTTP2ClientTest.java | 7 +-- .../server/ConscryptHTTP2ServerTest.java | 9 +-- .../alpn/java/client/JDK9HTTP2ClientTest.java | 7 +-- .../org/eclipse/jetty/client/HttpClient.java | 8 ++- .../jetty/client/jmx/HttpClientJMXTest.java | 13 ++--- .../jetty/http2/client/HTTP2Client.java | 8 ++- .../HttpClientTransportOverHTTP2Test.java | 57 +++++++++---------- .../http2/tests/ResponseTrailerTest.java | 9 +-- .../jetty/http3/client/HTTP3Client.java | 8 ++- .../jetty/http3/tests/ExternalServerTest.java | 19 ++----- .../unixdomain/server/UnixDomainTest.java | 43 +++++--------- .../websocket/client/WebSocketClient.java | 8 ++- .../websocket/client/HttpClientInitTest.java | 26 +++------ .../tests/client/ClientSessionsTest.java | 28 ++++----- .../tests/client/WebSocketClientTest.java | 33 +++-------- 15 files changed, 108 insertions(+), 175 deletions(-) diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java index f1a7d1938f0..d5623ef5733 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java @@ -57,8 +57,7 @@ public class ConscryptHTTP2ClientTest sslContextFactory.setProvider("Conscrypt"); Conscrypt.setDefaultHostnameVerifier((certs, hostname, session) -> true); - HTTP2Client client = new HTTP2Client(); - try + try (HTTP2Client client = new HTTP2Client()) { client.addBean(sslContextFactory); client.start(); @@ -97,10 +96,6 @@ public class ConscryptHTTP2ClientTest assertTrue(latch.await(15, TimeUnit.SECONDS)); } - finally - { - client.stop(); - } } private boolean canConnectTo(String host, int port) diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java index 3e328076475..10c5dfa1865 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java @@ -132,17 +132,12 @@ public class ConscryptHTTP2ServerTest ClientConnector clientConnector = new ClientConnector(); clientConnector.setSslContextFactory(newClientSslContextFactory()); HTTP2Client h2Client = new HTTP2Client(clientConnector); - HttpClient client = new HttpClient(new HttpClientTransportOverHTTP2(h2Client)); - client.start(); - try + try (HttpClient client = new HttpClient(new HttpClientTransportOverHTTP2(h2Client))) { + client.start(); int port = ((ServerConnector)server.getConnectors()[0]).getLocalPort(); ContentResponse contentResponse = client.GET("https://localhost:" + port); assertEquals(200, contentResponse.getStatus()); } - finally - { - client.stop(); - } } } diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-client/src/test/java/org/eclipse/jetty/alpn/java/client/JDK9HTTP2ClientTest.java b/jetty-core/jetty-alpn/jetty-alpn-java-client/src/test/java/org/eclipse/jetty/alpn/java/client/JDK9HTTP2ClientTest.java index 14187c9c633..d3508ec9aa7 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-java-client/src/test/java/org/eclipse/jetty/alpn/java/client/JDK9HTTP2ClientTest.java +++ b/jetty-core/jetty-alpn/jetty-alpn-java-client/src/test/java/org/eclipse/jetty/alpn/java/client/JDK9HTTP2ClientTest.java @@ -45,8 +45,7 @@ public class JDK9HTTP2ClientTest Assumptions.assumeTrue(canConnectTo(host, port)); - HTTP2Client client = new HTTP2Client(); - try + try (HTTP2Client client = new HTTP2Client()) { SslContextFactory.Client sslContextFactory = new SslContextFactory.Client(); client.addBean(sslContextFactory); @@ -87,10 +86,6 @@ public class JDK9HTTP2ClientTest latch.await(15, TimeUnit.SECONDS); } - finally - { - client.stop(); - } } private boolean canConnectTo(String host, int port) diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java index 7edbf36e20b..b6c40a2eb1d 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java @@ -104,7 +104,7 @@ import org.slf4j.LoggerFactory; * } */ @ManagedObject("The HTTP client") -public class HttpClient extends ContainerLifeCycle +public class HttpClient extends ContainerLifeCycle implements AutoCloseable { public static final String USER_AGENT = "Jetty/" + Jetty.VERSION; private static final Logger LOG = LoggerFactory.getLogger(HttpClient.class); @@ -1141,4 +1141,10 @@ public class HttpClient extends ContainerLifeCycle sslContextFactory = getSslContextFactory(); return new SslClientConnectionFactory(sslContextFactory, getByteBufferPool(), getExecutor(), connectionFactory); } + + @Override + public void close() throws Exception + { + stop(); + } } diff --git a/jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/jmx/HttpClientJMXTest.java b/jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/jmx/HttpClientJMXTest.java index 6ab77392c3e..02eb4a62f07 100644 --- a/jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/jmx/HttpClientJMXTest.java +++ b/jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/jmx/HttpClientJMXTest.java @@ -31,12 +31,11 @@ public class HttpClientJMXTest @Test public void testHttpClientName() throws Exception { - String name = "foo"; - HttpClient httpClient = new HttpClient(); - httpClient.setName(name); - - try + try (HttpClient httpClient = new HttpClient()) { + String name = "foo"; + httpClient.setName(name); + MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); MBeanContainer mbeanContainer = new MBeanContainer(mbeanServer); // Adding MBeanContainer as a bean will trigger the registration of MBeans. @@ -59,9 +58,5 @@ public class HttpClientJMXTest assertEquals(name, oName.getKeyProperty("context")); } } - finally - { - httpClient.stop(); - } } } diff --git a/jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2Client.java b/jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2Client.java index b49687bac79..89d2139c037 100644 --- a/jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2Client.java +++ b/jetty-core/jetty-http2/jetty-http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2Client.java @@ -99,7 +99,7 @@ import org.eclipse.jetty.util.thread.Scheduler; *} */ @ManagedObject -public class HTTP2Client extends ContainerLifeCycle +public class HTTP2Client extends ContainerLifeCycle implements AutoCloseable { private final ClientConnector connector; private int inputBufferSize = 8192; @@ -492,4 +492,10 @@ public class HTTP2Client extends ContainerLifeCycle } return factory; } + + @Override + public void close() throws Exception + { + stop(); + } } diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HttpClientTransportOverHTTP2Test.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HttpClientTransportOverHTTP2Test.java index 0173430314a..94abef51874 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HttpClientTransportOverHTTP2Test.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HttpClientTransportOverHTTP2Test.java @@ -106,27 +106,26 @@ public class HttpClientTransportOverHTTP2Test extends AbstractTest public void testPropertiesAreForwarded() throws Exception { HTTP2Client http2Client = new HTTP2Client(); - HttpClient httpClient = new HttpClient(new HttpClientTransportOverHTTP2(http2Client)); - Executor executor = new QueuedThreadPool(); - httpClient.setExecutor(executor); - httpClient.setConnectTimeout(13); - httpClient.setIdleTimeout(17); - httpClient.setUseInputDirectByteBuffers(false); - httpClient.setUseOutputDirectByteBuffers(false); + try (HttpClient httpClient = new HttpClient(new HttpClientTransportOverHTTP2(http2Client))) + { + Executor executor = new QueuedThreadPool(); + httpClient.setExecutor(executor); + httpClient.setConnectTimeout(13); + httpClient.setIdleTimeout(17); + httpClient.setUseInputDirectByteBuffers(false); + httpClient.setUseOutputDirectByteBuffers(false); - httpClient.start(); - - assertTrue(http2Client.isStarted()); - assertSame(httpClient.getExecutor(), http2Client.getExecutor()); - assertSame(httpClient.getScheduler(), http2Client.getScheduler()); - assertSame(httpClient.getByteBufferPool(), http2Client.getByteBufferPool()); - assertEquals(httpClient.getConnectTimeout(), http2Client.getConnectTimeout()); - assertEquals(httpClient.getIdleTimeout(), http2Client.getIdleTimeout()); - assertEquals(httpClient.isUseInputDirectByteBuffers(), http2Client.isUseInputDirectByteBuffers()); - assertEquals(httpClient.isUseOutputDirectByteBuffers(), http2Client.isUseOutputDirectByteBuffers()); - - httpClient.stop(); + httpClient.start(); + assertTrue(http2Client.isStarted()); + assertSame(httpClient.getExecutor(), http2Client.getExecutor()); + assertSame(httpClient.getScheduler(), http2Client.getScheduler()); + assertSame(httpClient.getByteBufferPool(), http2Client.getByteBufferPool()); + assertEquals(httpClient.getConnectTimeout(), http2Client.getConnectTimeout()); + assertEquals(httpClient.getIdleTimeout(), http2Client.getIdleTimeout()); + assertEquals(httpClient.isUseInputDirectByteBuffers(), http2Client.isUseInputDirectByteBuffers()); + assertEquals(httpClient.isUseOutputDirectByteBuffers(), http2Client.isUseOutputDirectByteBuffers()); + } assertTrue(http2Client.isStopped()); } @@ -833,16 +832,16 @@ public class HttpClientTransportOverHTTP2Test extends AbstractTest { ClientConnector clientConnector = new ClientConnector(); HTTP2Client http2Client = new HTTP2Client(clientConnector); - SslContextFactory.Client sslContextFactory = new SslContextFactory.Client(); - clientConnector.setSslContextFactory(sslContextFactory); - HttpClient httpClient = new HttpClient(new HttpClientTransportOverHTTP2(http2Client)); - Executor executor = new QueuedThreadPool(); - clientConnector.setExecutor(executor); - httpClient.start(); + try (HttpClient httpClient = new HttpClient(new HttpClientTransportOverHTTP2(http2Client))) + { + Executor executor = new QueuedThreadPool(); + clientConnector.setExecutor(executor); + SslContextFactory.Client sslContextFactory = new SslContextFactory.Client(); + clientConnector.setSslContextFactory(sslContextFactory); + httpClient.start(); - ContentResponse response = httpClient.GET("https://webtide.com/"); - assertEquals(HttpStatus.OK_200, response.getStatus()); - - httpClient.stop(); + ContentResponse response = httpClient.GET("https://webtide.com/"); + assertEquals(HttpStatus.OK_200, response.getStatus()); + } } } diff --git a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/ResponseTrailerTest.java b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/ResponseTrailerTest.java index 81416f5e040..eb38da17b8e 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/ResponseTrailerTest.java +++ b/jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/ResponseTrailerTest.java @@ -73,10 +73,9 @@ public class ResponseTrailerTest extends AbstractTest } }); - HTTP2Client http2Client = new HTTP2Client(); - http2Client.start(); - try + try (HTTP2Client http2Client = new HTTP2Client()) { + http2Client.start(); String host = "localhost"; int port = connector.getLocalPort(); InetSocketAddress address = new InetSocketAddress(host, port); @@ -116,9 +115,5 @@ public class ResponseTrailerTest extends AbstractTest assertNotNull(frame); assertTrue(frame.getMetaData().isResponse()); } - finally - { - http2Client.stop(); - } } } diff --git a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3Client.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3Client.java index 922c051ed3e..a813de45f6c 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3Client.java +++ b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3Client.java @@ -125,7 +125,7 @@ import org.slf4j.LoggerFactory; *

HTTP/3+QUIC support is experimental and not suited for production use. * APIs may change incompatibly between releases.

*/ -public class HTTP3Client extends ContainerLifeCycle +public class HTTP3Client extends ContainerLifeCycle implements AutoCloseable { public static final String CLIENT_CONTEXT_KEY = HTTP3Client.class.getName(); public static final String SESSION_LISTENER_CONTEXT_KEY = CLIENT_CONTEXT_KEY + ".listener"; @@ -217,4 +217,10 @@ public class HTTP3Client extends ContainerLifeCycle { return container.shutdown(); } + + @Override + public void close() throws Exception + { + stop(); + } } diff --git a/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ExternalServerTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ExternalServerTest.java index 1c7cd9048be..5ea72a4c7f3 100644 --- a/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ExternalServerTest.java +++ b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ExternalServerTest.java @@ -54,19 +54,13 @@ public class ExternalServerTest SslContextFactory.Client sslClient = new SslContextFactory.Client(); ClientQuicConfiguration quicConfig = new ClientQuicConfiguration(sslClient, null); HTTP3Client client = new HTTP3Client(quicConfig); - HttpClientTransportOverHTTP3 transport = new HttpClientTransportOverHTTP3(client); - HttpClient httpClient = new HttpClient(transport); - httpClient.start(); - try + try (HttpClient httpClient = new HttpClient(new HttpClientTransportOverHTTP3(client))) { + httpClient.start(); URI uri = URI.create("https://maven-central-eu.storage-download.googleapis.com/maven2/org/apache/maven/maven-parent/38/maven-parent-38.pom"); ContentResponse response = httpClient.newRequest(uri).send(); assertThat(response.getContentAsString(), containsString("maven-parent")); } - finally - { - httpClient.stop(); - } } @Test @@ -75,10 +69,9 @@ public class ExternalServerTest { SslContextFactory.Client sslClient = new SslContextFactory.Client(); ClientQuicConfiguration quicConfig = new ClientQuicConfiguration(sslClient, null); - HTTP3Client client = new HTTP3Client(quicConfig); - client.start(); - try + try (HTTP3Client client = new HTTP3Client(quicConfig)) { + client.start(); // Well-known HTTP/3 servers to try. // HostPort hostPort = new HostPort("maven-central-eu.storage-download.googleapis.com:443"); HostPort hostPort = new HostPort("google.com:443"); @@ -137,9 +130,5 @@ public class ExternalServerTest assertTrue(requestLatch.await(5, TimeUnit.SECONDS)); } - finally - { - client.stop(); - } } } diff --git a/jetty-core/jetty-unixdomain-server/src/test/java/org/eclipse/jetty/unixdomain/server/UnixDomainTest.java b/jetty-core/jetty-unixdomain-server/src/test/java/org/eclipse/jetty/unixdomain/server/UnixDomainTest.java index 65fa6b8b9e3..e6155d01250 100644 --- a/jetty-core/jetty-unixdomain-server/src/test/java/org/eclipse/jetty/unixdomain/server/UnixDomainTest.java +++ b/jetty-core/jetty-unixdomain-server/src/test/java/org/eclipse/jetty/unixdomain/server/UnixDomainTest.java @@ -118,20 +118,15 @@ public class UnixDomainTest // Use the deprecated APIs for backwards compatibility testing. ClientConnector clientConnector = ClientConnector.forUnixDomain(unixDomainPath); - HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic(clientConnector)); - httpClient.start(); - try + try (HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic(clientConnector))) { + httpClient.start(); ContentResponse response = httpClient.newRequest(uri) .timeout(5, TimeUnit.SECONDS) .send(); assertEquals(HttpStatus.OK_200, response.getStatus()); } - finally - { - httpClient.stop(); - } } @Test @@ -153,18 +148,17 @@ public class UnixDomainTest } }); - HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic()); - Origin proxyOrigin = new Origin( - "http", - new Origin.Address("localhost", fakeProxyPort), - null, - new Origin.Protocol(List.of("http/1.1"), false), - new Transport.TCPUnix(unixDomainPath) - ); - httpClient.getProxyConfiguration().addProxy(new HttpProxy(proxyOrigin, null)); - httpClient.start(); - try + try (HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic())) { + Origin proxyOrigin = new Origin( + "http", + new Origin.Address("localhost", fakeProxyPort), + null, + new Origin.Protocol(List.of("http/1.1"), false), + new Transport.TCPUnix(unixDomainPath) + ); + httpClient.getProxyConfiguration().addProxy(new HttpProxy(proxyOrigin, null)); + httpClient.start(); ContentResponse response = httpClient.newRequest("localhost", fakeServerPort) .transport(new Transport.TCPUnix(unixDomainPath)) .timeout(5, TimeUnit.SECONDS) @@ -172,10 +166,6 @@ public class UnixDomainTest assertEquals(HttpStatus.OK_200, response.getStatus()); } - finally - { - httpClient.stop(); - } } @Test @@ -215,10 +205,9 @@ public class UnixDomainTest } }); - HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic()); - httpClient.start(); - try + try (HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic())) { + httpClient.start(); // Try PROXYv1 with the PROXY information retrieved from the EndPoint. // PROXYv1 does not support the UNIX family. ContentResponse response1 = httpClient.newRequest("localhost", 0) @@ -241,10 +230,6 @@ public class UnixDomainTest assertEquals(HttpStatus.OK_200, response2.getStatus()); } - finally - { - httpClient.stop(); - } } @Test diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java index 6521a2624d4..d34dbcaa3bf 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java @@ -50,7 +50,7 @@ import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class WebSocketClient extends ContainerLifeCycle implements Configurable, WebSocketContainer +public class WebSocketClient extends ContainerLifeCycle implements Configurable, WebSocketContainer, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(WebSocketClient.class); private final WebSocketCoreClient coreClient; @@ -403,6 +403,12 @@ public class WebSocketClient extends ContainerLifeCycle implements Configurable, super.doStop(); } + @Override + public void close() throws Exception + { + stop(); + } + @Override public String toString() { diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java index 85026e32132..58a53a44161 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java @@ -30,8 +30,7 @@ public class HttpClientInitTest @Test public void testDefaultInit() throws Exception { - WebSocketClient client = new WebSocketClient(); - try + try (WebSocketClient client = new WebSocketClient()) { client.start(); HttpClient httpClient = client.getHttpClient(); @@ -43,27 +42,20 @@ public class HttpClientInitTest QueuedThreadPool threadPool = (QueuedThreadPool)executor; assertThat("QueuedThreadPool.name", threadPool.getName(), startsWith("WebSocket@")); } - finally - { - client.stop(); - } } @Test public void testManualInit() throws Exception { HttpClient http = new HttpClient(); - { - QueuedThreadPool threadPool = new QueuedThreadPool(); - threadPool.setName("ManualWSClient@" + http.hashCode()); - http.setExecutor(threadPool); - http.setConnectTimeout(7777); - } + QueuedThreadPool httpThreadPool = new QueuedThreadPool(); + httpThreadPool.setName("ManualWSClient@" + http.hashCode()); + http.setExecutor(httpThreadPool); + http.setConnectTimeout(7777); - WebSocketClient client = new WebSocketClient(http); - client.addBean(http); - try + try (WebSocketClient client = new WebSocketClient(http)) { + client.addBean(http); client.start(); HttpClient httpClient = client.getHttpClient(); assertThat("HttpClient exists", httpClient, notNullValue()); @@ -75,9 +67,5 @@ public class HttpClientInitTest QueuedThreadPool threadPool = (QueuedThreadPool)executor; assertThat("QueuedThreadPool.name", threadPool.getName(), startsWith("ManualWSClient@")); } - finally - { - client.stop(); - } } } diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java index 9ed4c9a5d1b..18538bb916f 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java @@ -83,22 +83,18 @@ public class ClientSessionsTest @Test public void testBasicEchoFromClient() throws Exception { - WebSocketClient client = new WebSocketClient(); - - CountDownLatch onSessionCloseLatch = new CountDownLatch(1); - - client.addSessionListener(new WebSocketSessionListener() + try (WebSocketClient client = new WebSocketClient()) { - @Override - public void onWebSocketSessionClosed(Session session) + CountDownLatch onSessionCloseLatch = new CountDownLatch(1); + client.addSessionListener(new WebSocketSessionListener() { - onSessionCloseLatch.countDown(); - } - }); - - client.start(); - try - { + @Override + public void onWebSocketSessionClosed(Session session) + { + onSessionCloseLatch.countDown(); + } + }); + client.start(); CloseTrackingEndpoint cliSock = new CloseTrackingEndpoint(); client.setIdleTimeout(Duration.ofSeconds(10)); @@ -136,9 +132,5 @@ public class ClientSessionsTest Collection open = client.getOpenSessions(); assertThat("(After Close) Open Sessions.size", open.size(), is(0)); } - finally - { - client.stop(); - } } } diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java index 8de2b8af681..55bca55c9e4 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java @@ -125,28 +125,19 @@ public class WebSocketClientTest @ValueSource(booleans = {false, true}) public void testCustomizeExecutorDirectly(boolean startHttpClient) throws Exception { - Executor executor = Executors.newFixedThreadPool(50); - HttpClient httpClient = new HttpClient(); - httpClient.setExecutor(executor); - try + try (HttpClient httpClient = new HttpClient()) { + Executor executor = Executors.newFixedThreadPool(50); + httpClient.setExecutor(executor); if (startHttpClient) httpClient.start(); - WebSocketClient webSocketClient = new WebSocketClient(httpClient); - try + + try (WebSocketClient webSocketClient = new WebSocketClient(httpClient)) { webSocketClient.start(); Executor wsExecutor = webSocketClient.getExecutor(); assertSame(executor, wsExecutor); } - finally - { - webSocketClient.stop(); - } - } - finally - { - httpClient.stop(); } } @@ -158,25 +149,15 @@ public class WebSocketClientTest Executor executor = Executors.newFixedThreadPool(50); clientConnector.setExecutor(executor); HttpClientTransport transport = new HttpClientTransportOverHTTP(clientConnector); - HttpClient httpClient = new HttpClient(transport); - try + try (HttpClient httpClient = new HttpClient(transport)) { httpClient.start(); - WebSocketClient webSocketClient = new WebSocketClient(httpClient); - try + try (WebSocketClient webSocketClient = new WebSocketClient(httpClient)) { webSocketClient.start(); Executor inuseExecutor = webSocketClient.getExecutor(); assertSame(executor, inuseExecutor); } - finally - { - webSocketClient.stop(); - } - } - finally - { - httpClient.stop(); } } From 8dafe0988b17433fb8b2df226fa62f64cea1695d Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 14 Aug 2024 08:41:53 -0500 Subject: [PATCH 4/9] Issue #12163 - Adding more HttpConfiguration output of fields to dump and jmx --- .../jetty/server/HttpConfiguration.java | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java index 70360dac03c..accc509c6f7 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java @@ -163,6 +163,7 @@ public class HttpConfiguration implements Dumpable _redirectUriCompliance = config._redirectUriCompliance; _serverAuthority = config._serverAuthority; _localAddress = config._localAddress; + _maxUnconsumedRequestContentReads = config._maxUnconsumedRequestContentReads; } /** @@ -499,8 +500,9 @@ public class HttpConfiguration implements Dumpable /** * @return the set of HTTP methods of requests that can be decoded as - * {@code x-www-form-urlencoded} content. + * {@code application/x-www-form-urlencoded} content. */ + @ManagedAttribute("The methods that support application/x-www-form-urlencoded content") public Set getFormEncodedMethods() { return _formEncodedMethods.keySet(); @@ -585,6 +587,7 @@ public class HttpConfiguration implements Dumpable _minResponseDataRate = bytesPerSecond; } + @ManagedAttribute("The HTTP compliance mode") public HttpCompliance getHttpCompliance() { return _httpCompliance; @@ -595,6 +598,7 @@ public class HttpConfiguration implements Dumpable _httpCompliance = httpCompliance; } + @ManagedAttribute("The URI compliance mode") public UriCompliance getUriCompliance() { return _uriCompliance; @@ -622,6 +626,7 @@ public class HttpConfiguration implements Dumpable * @return The CookieCompliance used for parsing request {@code Cookie} headers. * @see #getResponseCookieCompliance() */ + @ManagedAttribute("The HTTP request cookie compliance mode") public CookieCompliance getRequestCookieCompliance() { return _requestCookieCompliance; @@ -639,6 +644,7 @@ public class HttpConfiguration implements Dumpable * @return The CookieCompliance used for generating response {@code Set-Cookie} headers * @see #getRequestCookieCompliance() */ + @ManagedAttribute("The HTTP response cookie compliance mode") public CookieCompliance getResponseCookieCompliance() { return _responseCookieCompliance; @@ -655,6 +661,7 @@ public class HttpConfiguration implements Dumpable /** * @return the {@link MultiPartCompliance} used for validating multipart form syntax. */ + @ManagedAttribute("The multipart/form-data compliance mode") public MultiPartCompliance getMultiPartCompliance() { return _multiPartCompliance; @@ -765,7 +772,7 @@ public class HttpConfiguration implements Dumpable * * @return Returns the connection server authority (name/port) or null */ - @ManagedAttribute("The server authority if none provided by requests") + @ManagedAttribute("The server authority override") public HostPort getServerAuthority() { return _serverAuthority; @@ -833,6 +840,7 @@ public class HttpConfiguration implements Dumpable "requestHeaderSize=" + _requestHeaderSize, "responseHeaderSize=" + _responseHeaderSize, "headerCacheSize=" + _headerCacheSize, + "headerCacheCaseSensitive=" + _headerCacheCaseSensitive, "secureScheme=" + _secureScheme, "securePort=" + _securePort, "idleTimeout=" + _idleTimeout, @@ -842,12 +850,21 @@ public class HttpConfiguration implements Dumpable "delayDispatchUntilContent=" + _delayDispatchUntilContent, "persistentConnectionsEnabled=" + _persistentConnectionsEnabled, "maxErrorDispatches=" + _maxErrorDispatches, + "useInputDirectByteBuffers=" + _useInputDirectByteBuffers, + "useOutputDirectByteBuffers=" + _useOutputDirectByteBuffers, "minRequestDataRate=" + _minRequestDataRate, "minResponseDataRate=" + _minResponseDataRate, + "httpCompliance=" + _httpCompliance, + "uriCompliance=" + _uriCompliance, + "redirectUriCompliance=" + _redirectUriCompliance, "requestCookieCompliance=" + _requestCookieCompliance, "responseCookieCompliance=" + _responseCookieCompliance, + "multiPartCompliance=" + _multiPartCompliance, "notifyRemoteAsyncErrors=" + _notifyRemoteAsyncErrors, - "relativeRedirectAllowed=" + _relativeRedirectAllowed + "relativeRedirectAllowed=" + _relativeRedirectAllowed, + "serverAuthority=" + _serverAuthority, + "localAddress=" + _localAddress, + "maxUnconsumedRequestContentReads=" + _maxUnconsumedRequestContentReads ); } From 457a672756458bba2168ceaac2745e2212650521 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 15 Aug 2024 18:58:33 -0500 Subject: [PATCH 5/9] Issue #11408 - Environment property values are not expanded (#12169) If a property belonged to an Environment, then that property value was not expanded. --- .../org/eclipse/jetty/start/StartArgs.java | 5 +- .../org/eclipse/jetty/start/MainTest.java | 10 +- .../org/eclipse/jetty/start/PropertyDump.java | 43 ++--- .../jetty/start/PropertyPassingTest.java | 170 ++++++++++++++++-- 4 files changed, 183 insertions(+), 45 deletions(-) diff --git a/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java index 6657fe4787d..93e679f6b44 100644 --- a/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java +++ b/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java @@ -687,8 +687,9 @@ public class StartArgs // TODO module path - for (Prop property : environment.getProperties()) - cmd.addArg(property.key, property.value); + Props props = environment.getProperties(); + for (Prop property : props) + cmd.addArg(property.key, props.expand(property.value)); for (Path xmlFile : environment.getXmlFiles()) cmd.addArg(xmlFile.toAbsolutePath().toString()); diff --git a/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java b/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java index 2b8d2946877..eac62584e6c 100644 --- a/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java +++ b/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java @@ -14,7 +14,6 @@ package org.eclipse.jetty.start; import java.io.ByteArrayOutputStream; -import java.io.File; import java.io.PrintStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -24,7 +23,6 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jetty.toolchain.test.MavenPaths; -import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -67,7 +65,7 @@ public class MainTest public void testListConfig() throws Exception { List cmdLineArgs = new ArrayList<>(); - File testJettyHome = MavenTestingUtils.getTestResourceDir("dist-home"); + Path testJettyHome = MavenPaths.findTestResourceDir("dist-home"); cmdLineArgs.add("user.dir=" + testJettyHome); cmdLineArgs.add("-Duser.dir=foo"); // used to test "source" display on "Java Environment" cmdLineArgs.add("jetty.home=" + testJettyHome); @@ -99,8 +97,8 @@ public class MainTest public void testUnknownDistroCommand() throws Exception { List cmdLineArgs = new ArrayList<>(); - File testJettyHome = MavenTestingUtils.getTestResourceDir("dist-home"); - Path testJettyBase = MavenTestingUtils.getTargetTestingPath("base-example-unknown"); + Path testJettyHome = MavenPaths.findTestResourceDir("dist-home"); + Path testJettyBase = MavenPaths.targetTestDir("base-example-unknown"); FS.ensureDirectoryExists(testJettyBase); Path zedIni = testJettyBase.resolve("start.d/zed.ini"); FS.ensureDirectoryExists(zedIni.getParent()); @@ -159,7 +157,7 @@ public class MainTest { List cmdLineArgs = new ArrayList<>(); - Path homePath = MavenTestingUtils.getTestResourcePathDir("dist-home").toRealPath(); + Path homePath = MavenPaths.findTestResourceDir("dist-home"); cmdLineArgs.add("jetty.home=" + homePath); cmdLineArgs.add("user.dir=" + homePath); diff --git a/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/PropertyDump.java b/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/PropertyDump.java index b7628290b70..ab287a43f14 100644 --- a/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/PropertyDump.java +++ b/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/PropertyDump.java @@ -16,30 +16,35 @@ package org.eclipse.jetty.start; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.util.Enumeration; +import java.util.Collections; +import java.util.Objects; import java.util.Properties; +import java.util.function.Predicate; public class PropertyDump { public static void main(String[] args) { System.out.printf("PropertyDump%n"); + + Predicate nameSelectionPredicate = + (name) -> + name.startsWith("test.") || + name.startsWith("jetty."); + // As System Properties Properties props = System.getProperties(); - Enumeration names = props.propertyNames(); - while (names.hasMoreElements()) - { - String name = (String)names.nextElement(); - // only interested in "test." prefixed properties - if (name.startsWith("test.")) - { - System.out.printf("System %s=%s%n", name, props.getProperty(name)); - } - } + props.stringPropertyNames() + .stream() + .filter(nameSelectionPredicate) + .sorted() + .forEach((name) -> + System.out.printf("System %s=%s%n", name, props.getProperty(name))); // As File Argument for (String arg : args) { + System.out.printf("Arg [%s]%n", arg); if (arg.endsWith(".properties")) { Properties aprops = new Properties(); @@ -47,15 +52,13 @@ public class PropertyDump try (FileReader reader = new FileReader(propFile)) { aprops.load(reader); - Enumeration anames = aprops.propertyNames(); - while (anames.hasMoreElements()) - { - String name = (String)anames.nextElement(); - if (name.startsWith("test.")) - { - System.out.printf("%s %s=%s%n", propFile.getName(), name, aprops.getProperty(name)); - } - } + Collections.list(aprops.propertyNames()) + .stream() + .map(Objects::toString) + .filter(nameSelectionPredicate) + .sorted() + .forEach((name) -> + System.out.printf("%s %s=%s%n", propFile.getName(), name, aprops.getProperty(name))); } catch (IOException e) { diff --git a/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/PropertyPassingTest.java b/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/PropertyPassingTest.java index 3e5bf9816d8..5f609f36b1b 100644 --- a/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/PropertyPassingTest.java +++ b/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/PropertyPassingTest.java @@ -20,19 +20,26 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintWriter; import java.io.StringWriter; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.eclipse.jetty.toolchain.test.IO; -import org.eclipse.jetty.toolchain.test.MavenTestingUtils; +import org.eclipse.jetty.toolchain.test.MavenPaths; +import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; +import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; +@ExtendWith(WorkDirExtension.class) public class PropertyPassingTest { private static class ConsoleCapture implements Runnable @@ -86,10 +93,12 @@ public class PropertyPassingTest } } + public WorkDir workDir; + @Test public void testAsJvmArg() throws IOException, InterruptedException { - File bogusXml = MavenTestingUtils.getTestResourceFile("bogus.xml"); + Path bogusXml = MavenPaths.findTestResourceFile("bogus.xml"); // Setup command line List commands = new ArrayList<>(); @@ -100,7 +109,7 @@ public class PropertyPassingTest // addDebug(commands); commands.add("-Dtest.foo=bar"); // TESTING THIS commands.add(getStartJarBin()); - commands.add(bogusXml.getAbsolutePath()); + commands.add(bogusXml.toAbsolutePath().toString()); // Run command, collect output String output = collectRunOutput(commands); @@ -112,7 +121,7 @@ public class PropertyPassingTest @Test public void testAsCommandLineArg() throws IOException, InterruptedException { - File bogusXml = MavenTestingUtils.getTestResourceFile("bogus.xml"); + Path bogusXml = MavenPaths.findTestResourceFile("bogus.xml"); // Setup command line List commands = new ArrayList<>(); @@ -123,7 +132,7 @@ public class PropertyPassingTest // addDebug(commands); commands.add(getStartJarBin()); commands.add("test.foo=bar"); // TESTING THIS - commands.add(bogusXml.getAbsolutePath()); + commands.add(bogusXml.toAbsolutePath().toString()); // Run command, collect output String output = collectRunOutput(commands); @@ -135,7 +144,7 @@ public class PropertyPassingTest @Test public void testAsDashDCommandLineArg() throws IOException, InterruptedException { - File bogusXml = MavenTestingUtils.getTestResourceFile("bogus.xml"); + Path bogusXml = MavenPaths.findTestResourceFile("bogus.xml"); // Setup command line List commands = new ArrayList<>(); @@ -146,7 +155,7 @@ public class PropertyPassingTest // addDebug(commands); commands.add(getStartJarBin()); commands.add("-Dtest.foo=bar"); // TESTING THIS - commands.add(bogusXml.getAbsolutePath()); + commands.add(bogusXml.toAbsolutePath().toString()); // Run command, collect output String output = collectRunOutput(commands); @@ -155,16 +164,143 @@ public class PropertyPassingTest assertThat(output, containsString("test.foo=bar")); } + @Test + public void testExpandPropertyArg() throws IOException, InterruptedException + { + Path bogusXml = MavenPaths.findTestResourceFile("bogus.xml"); + + // Setup command line + List commands = new ArrayList<>(); + commands.add(getJavaBin()); + commands.add("-Dmain.class=" + PropertyDump.class.getName()); + commands.add("-Dtest.dir=/opt/dists/jetty"); + commands.add("-cp"); + commands.add(getClassPath()); + // addDebug(commands); + commands.add(getStartJarBin()); + commands.add("test.config=${test.dir}/etc/config.ini"); // TESTING THIS + commands.add(bogusXml.toAbsolutePath().toString()); + + // Run command, collect output + String output = collectRunOutput(commands); + + // Test for values + assertThat(output, containsString("test.config=/opt/dists/jetty/etc/config.ini")); + } + + @Test + public void testExpandPropertyDArg() throws IOException, InterruptedException + { + Path bogusXml = MavenPaths.findTestResourceFile("bogus.xml"); + + // Setup command line + List commands = new ArrayList<>(); + commands.add(getJavaBin()); + commands.add("-Dmain.class=" + PropertyDump.class.getName()); + commands.add("-Dtest.dir=/opt/dists/jetty"); + commands.add("-cp"); + commands.add(getClassPath()); + // addDebug(commands); + commands.add(getStartJarBin()); + commands.add("-Dtest.config=${test.dir}/etc/config.ini"); // TESTING THIS + commands.add(bogusXml.toAbsolutePath().toString()); + + // Run command, collect output + String output = collectRunOutput(commands); + + // Test for values + assertThat(output, containsString("test.config=/opt/dists/jetty/etc/config.ini")); + } + + @Test + public void testExpandPropertyStartIni() throws IOException, InterruptedException + { + Path bogusXml = MavenPaths.findTestResourceFile("bogus.xml"); + Path base = workDir.getEmptyPathDir(); + Path ini = base.resolve("start.d/config.ini"); + FS.ensureDirectoryExists(ini.getParent()); + String iniBody = """ + # Enabling a single module (that does nothing) to let start.jar run + --module=empty + # TESTING THIS (it should expand the ${jetty.base} portion + test.config=${jetty.base}/etc/config.ini + """; + Files.writeString(ini, iniBody, StandardCharsets.UTF_8); + + // Setup command line + List commands = new ArrayList<>(); + commands.add(getJavaBin()); + commands.add("-Dmain.class=" + PropertyDump.class.getName()); + commands.add("-Djetty.base=" + base); + commands.add("-cp"); + commands.add(getClassPath()); + // addDebug(commands); + commands.add(getStartJarBin()); + commands.add(bogusXml.toAbsolutePath().toString()); + + // Run command, collect output + String output = collectRunOutput(commands); + + // Test for values + Path expectedPath = base.resolve("etc/config.ini"); + assertThat(output, containsString("test.config=" + expectedPath)); + } + + @Test + public void testExpandEnvProperty() throws IOException, InterruptedException + { + Path bogusXml = MavenPaths.findTestResourceFile("bogus.xml"); + Path base = workDir.getEmptyPathDir(); + Path module = base.resolve("modules/env-config.mod"); + FS.ensureDirectoryExists(module.getParent()); + String moduleBody = """ + [environment] + eex + + [ini-template] + # configuration option + # test.config=${jetty.home}/etc/eex-config.ini + """; + Files.writeString(module, moduleBody, StandardCharsets.UTF_8); + Path ini = base.resolve("start.d/config.ini"); + FS.ensureDirectoryExists(ini.getParent()); + String iniBody = """ + # Enabling a single module (that does nothing) to let start.jar run + --module=env-config + # TESTING THIS (it should expand the ${jetty.base} portion + test.config=${jetty.base}/etc/config.ini + """; + Files.writeString(ini, iniBody, StandardCharsets.UTF_8); + + // Setup command line + List commands = new ArrayList<>(); + commands.add(getJavaBin()); + commands.add("-Dmain.class=" + PropertyDump.class.getName()); + commands.add("-Djetty.base=" + base); + commands.add("-cp"); + commands.add(getClassPath()); + // addDebug(commands); + commands.add(getStartJarBin()); + commands.add(bogusXml.toAbsolutePath().toString()); + + // Run command, collect output + String output = collectRunOutput(commands); + + // Test for values + Path expectedPath = base.resolve("etc/config.ini"); + assertThat(output, containsString("test.config=" + expectedPath)); + } + private String getClassPath() { - StringBuilder cp = new StringBuilder(); - String pathSep = System.getProperty("path.separator"); - cp.append(MavenTestingUtils.getProjectDir("target/classes")); - cp.append(pathSep); - cp.append(MavenTestingUtils.getProjectDir("target/test-classes")); - cp.append(pathSep); - cp.append(MavenTestingUtils.getProjectDir("target/jetty-util")); - return cp.toString(); + return String.join( + File.pathSeparator, + List.of( + MavenPaths.projectBase().resolve("target/classes").toString(), + MavenPaths.projectBase().resolve("target/test-classes").toString(), + MavenPaths.projectBase().resolve("target/jetty-util").toString() + ) + ); } protected void addDebug(List commands) @@ -180,11 +316,10 @@ public class PropertyPassingTest { cline.append(command).append(" "); } - System.out.println("Command line: " + cline); ProcessBuilder builder = new ProcessBuilder(commands); // Set PWD - builder.directory(MavenTestingUtils.getTestResourceDir("empty.home")); + builder.directory(MavenPaths.findTestResourceDir("empty.home").toFile()); Process pid = builder.start(); ConsoleCapture stdOutPump = new ConsoleCapture("STDOUT", pid.getInputStream()).start(); @@ -193,6 +328,7 @@ public class PropertyPassingTest int exitCode = pid.waitFor(); if (exitCode != 0) { + System.out.println("Command line: " + cline); System.out.printf("STDERR: [" + stdErrPump.getConsoleOutput() + "]%n"); System.out.printf("STDOUT: [" + stdOutPump.getConsoleOutput() + "]%n"); assertThat("Exit code", exitCode, is(0)); From 942e77c3c5a0831284b919aaa8a0fde461aa898b Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 20 Aug 2024 11:19:32 +0300 Subject: [PATCH 6/9] Fixes #6514 - How to warm up SslConnection. (#12151) Implemented "priming" of HTTP/1.1 connections using ConnectionPool.preCreateConnections(int) and HttpClientTransportOverHTTP.setInitializeConnections(true). This sends `OPTIONS * HTTP/1.1` to the server. I tried to implement this feature by forcing a write of 0 bytes from the layer above `SslConnection`, but it did not work when using TLS because in both WriteFlusher and SslConnection the fact that there are 0 bytes left to write is treated specially. Other HTTP versions have no problems because they must initialize the connection by e.g. sending a SETTINGS frame, so they would also initialize TLS. Signed-off-by: Simone Bordet --- .../client/http/HTTPClientDocs.java | 25 +++++ .../programming-guide/pages/client/http.adoc | 30 ++++- .../HttpClientConnectionFactory.java | 35 +++++- .../HttpClientTransportOverHTTP.java | 36 +++++- .../internal/HttpConnectionOverHTTP.java | 39 ++++++- .../jetty/client/ConnectionPoolTest.java | 2 +- .../test/client/transport/AbstractTest.java | 7 +- .../client/transport/ConnectionPoolTest.java | 104 ++++++++++++++++++ 8 files changed, 267 insertions(+), 11 deletions(-) create mode 100644 jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/ConnectionPoolTest.java diff --git a/documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java b/documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java index 031cd030220..693e23aa489 100644 --- a/documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java +++ b/documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java @@ -1049,6 +1049,31 @@ public class HTTPClientDocs // end::setConnectionPool[] } + public void preCreateConnections() throws Exception + { + // tag::preCreateConnections[] + HttpClient httpClient = new HttpClient(); + httpClient.start(); + + // For HTTP/1.1, you need to explicitly configure to initialize connections. + if (httpClient.getTransport() instanceof HttpClientTransportOverHTTP http1) + http1.setInitializeConnections(true); + + // Create a dummy request to the server you want to pre-create connections to. + Request request = httpClient.newRequest("https://host/"); + + // Resolve the destination for that request. + Destination destination = httpClient.resolveDestination(request); + + // Pre-create, for example, half of the connections. + int preCreate = httpClient.getMaxConnectionsPerDestination() / 2; + CompletableFuture completable = destination.getConnectionPool().preCreateConnections(preCreate); + + // Wait for the connections to be created. + completable.get(5, TimeUnit.SECONDS); + // end::preCreateConnections[] + } + public void unixDomain() throws Exception { // tag::unixDomain[] diff --git a/documentation/jetty/modules/programming-guide/pages/client/http.adoc b/documentation/jetty/modules/programming-guide/pages/client/http.adoc index bb145a15fc9..38fef9c2f88 100644 --- a/documentation/jetty/modules/programming-guide/pages/client/http.adoc +++ b/documentation/jetty/modules/programming-guide/pages/client/http.adoc @@ -158,7 +158,7 @@ Jetty's client library provides the following `ConnectionPool` implementations: * `DuplexConnectionPool`, historically the first implementation, only used by the HTTP/1.1 transport. * `MultiplexConnectionPool`, the generic implementation valid for any transport where connections are reused with a most recently used algorithm (that is, the connections most recently returned to the connection pool are the more likely to be used again). * `RoundRobinConnectionPool`, similar to `MultiplexConnectionPool` but where connections are reused with a round-robin algorithm. -* `RandomRobinConnectionPool`, similar to `MultiplexConnectionPool` but where connections are reused with an algorithm that chooses them randomly. +* `RandomConnectionPool`, similar to `MultiplexConnectionPool` but where connections are reused with an algorithm that chooses them randomly. The `ConnectionPool` implementation can be customized for each destination in by setting a `ConnectionPool.Factory` on the `HttpClientTransport`: @@ -167,6 +167,34 @@ The `ConnectionPool` implementation can be customized for each destination in by include::code:example$src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java[tags=setConnectionPool] ---- +[[connection-pool-precreate-connections]] +=== Pre-Creating Connections + +`ConnectionPool` offers the ability to pre-create connections by calling `ConnectionPool.preCreateConnections(int)`. + +Pre-creating the connections saves the time and processing spent to establish the TCP connection, performing the TLS handshake (if necessary) and, for HTTP/2 and HTTP/3, perform the initial protocol setup. +This is particularly important for HTTP/2 because in the initial protocol setup the server informs the client of the maximum number of concurrent requests per connection (otherwise assumed to be just `1` by the client). + +The scenarios where pre-creating connections is useful are, for example: + +* Load testing, where you want to prepare the system with connections already created to avoid paying of cost of connection setup. +* Proxying scenarios, often in conjunction with the use of `RoundRobinConnectionPool` or `RandomConnectionPool`, where the proxy creates early the connections to the backend servers. + +This is an example of how to pre-create connections: + +[,java,indent=0] +---- +include::code:example$src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java[tags=preCreateConnections] +---- + +[NOTE] +==== +Pre-creating connections for secure HTTP/1.1 requires you to call `HttpClientTransportOverHTTP.setInitializeConnections(true)`, otherwise only the TCP connection is established, but the TLS handshake is not initiated. + +To initialize connections for secure HTTP/1.1, the client sends an initial `OPTIONS * HTTP/1.1` request to the server. +The server must be able to handle this request without closing the connection (in particular it must not add the `Connection: close` header in the response). +==== + [[request-processing]] == HttpClient Request Processing diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientConnectionFactory.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientConnectionFactory.java index c5e9f081a85..e33503fe3f4 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientConnectionFactory.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientConnectionFactory.java @@ -26,20 +26,49 @@ public class HttpClientConnectionFactory implements ClientConnectionFactory /** *

Representation of the {@code HTTP/1.1} application protocol used by {@link HttpClientTransportDynamic}.

*/ - public static final Info HTTP11 = new HTTP11(new HttpClientConnectionFactory()); + public static final Info HTTP11 = new HTTP11(); + + private boolean initializeConnections; + + /** + * @return whether newly created connections should be initialized with an {@code OPTIONS * HTTP/1.1} request + */ + public boolean isInitializeConnections() + { + return initializeConnections; + } + + /** + * @param initialize whether newly created connections should be initialized with an {@code OPTIONS * HTTP/1.1} request + */ + public void setInitializeConnections(boolean initialize) + { + this.initializeConnections = initialize; + } @Override public org.eclipse.jetty.io.Connection newConnection(EndPoint endPoint, Map context) { HttpConnectionOverHTTP connection = new HttpConnectionOverHTTP(endPoint, context); + connection.setInitialize(isInitializeConnections()); return customize(connection, context); } - private static class HTTP11 extends Info + /** + *

Representation of the {@code HTTP/1.1} application protocol used by {@link HttpClientTransportDynamic}.

+ *

Applications should prefer using the constant {@link HttpClientConnectionFactory#HTTP11}, unless they + * need to customize the associated {@link HttpClientConnectionFactory}.

+ */ + public static class HTTP11 extends Info { private static final List protocols = List.of("http/1.1"); - private HTTP11(ClientConnectionFactory factory) + public HTTP11() + { + this(new HttpClientConnectionFactory()); + } + + public HTTP11(ClientConnectionFactory factory) { super(factory); } diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientTransportOverHTTP.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientTransportOverHTTP.java index bab51d75dca..2ed1ad5fba6 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientTransportOverHTTP.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientTransportOverHTTP.java @@ -22,7 +22,6 @@ import org.eclipse.jetty.client.Destination; import org.eclipse.jetty.client.DuplexConnectionPool; import org.eclipse.jetty.client.Origin; import org.eclipse.jetty.client.Request; -import org.eclipse.jetty.io.ClientConnectionFactory; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.ProcessorUtils; @@ -37,7 +36,7 @@ public class HttpClientTransportOverHTTP extends AbstractConnectorHttpClientTran public static final Origin.Protocol HTTP11 = new Origin.Protocol(List.of("http/1.1"), false); private static final Logger LOG = LoggerFactory.getLogger(HttpClientTransportOverHTTP.class); - private final ClientConnectionFactory factory = new HttpClientConnectionFactory(); + private final HttpClientConnectionFactory factory = new HttpClientConnectionFactory(); private int headerCacheSize = 1024; private boolean headerCacheCaseSensitive; @@ -79,25 +78,54 @@ public class HttpClientTransportOverHTTP extends AbstractConnectorHttpClientTran return connection; } - @ManagedAttribute("The maximum allowed size in bytes for an HTTP header field cache") + /** + * @return the max size in bytes for the HTTP header field cache + */ + @ManagedAttribute("The maximum allowed size in bytes for the HTTP header field cache") public int getHeaderCacheSize() { return headerCacheSize; } + /** + * @param headerCacheSize the max size in bytes for the HTTP header field cache + */ public void setHeaderCacheSize(int headerCacheSize) { this.headerCacheSize = headerCacheSize; } - @ManagedAttribute("Whether the header field cache is case sensitive") + /** + * @return whether the HTTP header field cache is case-sensitive + */ + @ManagedAttribute("Whether the HTTP header field cache is case-sensitive") public boolean isHeaderCacheCaseSensitive() { return headerCacheCaseSensitive; } + /** + * @param headerCacheCaseSensitive whether the HTTP header field cache is case-sensitive + */ public void setHeaderCacheCaseSensitive(boolean headerCacheCaseSensitive) { this.headerCacheCaseSensitive = headerCacheCaseSensitive; } + + /** + * @return whether newly created connections should be initialized with an {@code OPTIONS * HTTP/1.1} request + */ + @ManagedAttribute("Whether newly created connections should be initialized with an OPTIONS * HTTP/1.1 request") + public boolean isInitializeConnections() + { + return factory.isInitializeConnections(); + } + + /** + * @param initialize whether newly created connections should be initialized with an {@code OPTIONS * HTTP/1.1} request + */ + public void setInitializeConnections(boolean initialize) + { + factory.setInitializeConnections(initialize); + } } diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpConnectionOverHTTP.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpConnectionOverHTTP.java index d977f2b25c0..e9913fa7c5a 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpConnectionOverHTTP.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpConnectionOverHTTP.java @@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.LongAdder; import org.eclipse.jetty.client.Connection; +import org.eclipse.jetty.client.Destination; import org.eclipse.jetty.client.HttpClientTransport; import org.eclipse.jetty.client.HttpUpgrader; import org.eclipse.jetty.client.Request; @@ -40,6 +41,7 @@ import org.eclipse.jetty.client.transport.HttpRequest; import org.eclipse.jetty.client.transport.IConnection; import org.eclipse.jetty.client.transport.SendFailure; import org.eclipse.jetty.http.HttpHeader; +import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.io.AbstractConnection; import org.eclipse.jetty.io.EndPoint; @@ -61,6 +63,7 @@ public class HttpConnectionOverHTTP extends AbstractConnection implements IConne private final LongAdder bytesIn = new LongAdder(); private final LongAdder bytesOut = new LongAdder(); private long idleTimeout; + private boolean initialize; public HttpConnectionOverHTTP(EndPoint endPoint, Map context) { @@ -159,12 +162,46 @@ public class HttpConnectionOverHTTP extends AbstractConnection implements IConne return delegate.send(exchange); } + /** + * @return whether to initialize the connection with an {@code OPTIONS * HTTP/1.1} request. + */ + public boolean isInitialize() + { + return initialize; + } + + /** + * @param initialize whether to initialize the connection with an {@code OPTIONS * HTTP/1.1} request. + */ + public void setInitialize(boolean initialize) + { + this.initialize = initialize; + } + @Override public void onOpen() { super.onOpen(); fillInterested(); - promise.succeeded(this); + boolean initialize = isInitialize(); + if (initialize) + { + Destination destination = getHttpDestination(); + Request request = destination.getHttpClient().newRequest(destination.getOrigin().asString()) + .method(HttpMethod.OPTIONS) + .path("*"); + send(request, result -> + { + if (result.isSucceeded()) + promise.succeeded(this); + else + promise.failed(result.getFailure()); + }); + } + else + { + promise.succeeded(this); + } } @Override diff --git a/jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolTest.java b/jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolTest.java index e03b46f293c..7e62ae170a4 100644 --- a/jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolTest.java +++ b/jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolTest.java @@ -703,7 +703,7 @@ public class ConnectionPoolTest assertThat(connectionPool.toString(), not(nullValue())); } - private static class ConnectionPoolFactory + public static class ConnectionPoolFactory { private final String name; private final ConnectionPool.Factory factory; diff --git a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/AbstractTest.java b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/AbstractTest.java index b51f938ea72..8f4932f39fa 100644 --- a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/AbstractTest.java +++ b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/AbstractTest.java @@ -290,6 +290,12 @@ public class AbstractTest } protected void startClient(Transport transport) throws Exception + { + prepareClient(transport); + client.start(); + } + + protected void prepareClient(Transport transport) throws Exception { QueuedThreadPool clientThreads = new QueuedThreadPool(); clientThreads.setName("client"); @@ -298,7 +304,6 @@ public class AbstractTest client.setByteBufferPool(clientBufferPool); client.setExecutor(clientThreads); client.setSocketAddressResolver(new SocketAddressResolver.Sync()); - client.start(); } public AbstractConnector newConnector(Transport transport, Server server) diff --git a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/ConnectionPoolTest.java b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/ConnectionPoolTest.java new file mode 100644 index 00000000000..a634883faea --- /dev/null +++ b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/ConnectionPoolTest.java @@ -0,0 +1,104 @@ +// +// ======================================================================== +// Copyright (c) 1995 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.test.client.transport; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import org.eclipse.jetty.client.Destination; +import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP; +import org.eclipse.jetty.fcgi.server.internal.ServerFCGIConnection; +import org.eclipse.jetty.http2.server.internal.HTTP2ServerConnection; +import org.eclipse.jetty.io.Connection; +import org.eclipse.jetty.io.ssl.SslConnection; +import org.eclipse.jetty.quic.server.ServerQuicConnection; +import org.eclipse.jetty.server.internal.HttpConnection; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.not; + +public class ConnectionPoolTest extends AbstractTest +{ + @ParameterizedTest + @MethodSource("transports") + public void testPreCreateConnections(Transport transport) throws Exception + { + prepareServer(transport, new EmptyServerHandler()); + ConnectionListener serverConnections = new ConnectionListener(); + connector.addBean(serverConnections); + server.start(); + + startClient(transport); + client.setMaxConnectionsPerDestination(8); + if (transport == Transport.HTTPS) + ((HttpClientTransportOverHTTP)client.getTransport()).setInitializeConnections(true); + + var request = client.newRequest(newURI(transport)); + Destination destination = client.resolveDestination(request); + destination.getConnectionPool().preCreateConnections(client.getMaxConnectionsPerDestination()) + .get(5, TimeUnit.SECONDS); + + // Verify that connections have been created. + List connections = switch (transport) + { + case HTTP, HTTPS -> serverConnections.filter(HttpConnection.class); + case H2C, H2 -> serverConnections.filter(HTTP2ServerConnection.class); + case H3 -> serverConnections.filter(ServerQuicConnection.class); + case FCGI -> serverConnections.filter(ServerFCGIConnection.class); + }; + assertThat(connections, not(empty())); + + // Verify that TLS was performed. + List sslConnections = switch (transport) + { + case HTTP, H2C, FCGI, H3 -> null; + case HTTPS, H2 -> serverConnections.filter(SslConnection.class); + }; + if (sslConnections != null) + { + assertThat(sslConnections.size(), greaterThan(0)); + sslConnections.forEach(c -> assertThat(c.getBytesIn(), greaterThan(0L))); + sslConnections.forEach(c -> assertThat(c.getBytesOut(), greaterThan(0L))); + } + } + + private static class ConnectionListener implements Connection.Listener + { + private final List connections = new ArrayList<>(); + + @Override + public void onOpened(Connection connection) + { + connections.add(connection); + } + + @Override + public void onClosed(Connection connection) + { + connections.remove(connection); + } + + private List filter(Class klass) + { + return connections.stream() + .filter(klass::isInstance) + .toList(); + } + } +} From 0cae6351f4fe2f4265d4c650a6db73084ac259ca Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Wed, 21 Aug 2024 09:29:59 +1000 Subject: [PATCH 7/9] Issue #12173 Ingore dependencies of type pom for the webapp classpath (#12177) --- .../ee10/maven/plugin/AbstractUnassembledWebAppMojo.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/AbstractUnassembledWebAppMojo.java b/jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/AbstractUnassembledWebAppMojo.java index 7e5683fd16e..986fd2fcb87 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/AbstractUnassembledWebAppMojo.java +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/AbstractUnassembledWebAppMojo.java @@ -242,6 +242,10 @@ public abstract class AbstractUnassembledWebAppMojo extends AbstractWebAppMojo if ("war".equalsIgnoreCase(artifact.getType())) return false; + //The dependency cannot be a pom + if ("pom".equalsIgnoreCase(artifact.getType())) + return false; + //The dependency cannot be scope provided (those should be added to the plugin classpath) if (Artifact.SCOPE_PROVIDED.equals(artifact.getScope())) return false; From 2ca9be96ae9e5a86eef34aea9d6f72770bb77a3c Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 21 Aug 2024 15:18:20 +1000 Subject: [PATCH 8/9] change urls https://eclipse.dev to https://jetty.org (#12172) * change urls https://eclipse.dev to https://jetty.org --------- Signed-off-by: Olivier Lamy --- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/ISSUE_TEMPLATE/issue-template.md | 2 +- .github/ISSUE_TEMPLATE/release-template.md | 2 +- .../jetty-alpn-server/src/main/config/etc/jetty-alpn.xml | 2 +- jetty-core/jetty-client/src/main/config/modules/client.mod | 2 +- .../src/main/config/modules/demo-handler.mod | 2 +- .../src/main/config/modules/demo.d/demo-handler.xml | 2 +- .../jetty-deploy/src/main/config/etc/jetty-core-deploy.xml | 2 +- .../jetty-deploy/src/main/config/etc/jetty-deploy.xml | 2 +- .../jetty-deploy/src/test/resources/etc/core-context.xml | 2 +- .../src/test/resources/jetty-deploymgr-contexts.xml | 2 +- jetty-core/jetty-deploy/src/test/resources/jetty-http.xml | 2 +- jetty-core/jetty-deploy/src/test/resources/jetty.xml | 4 ++-- .../src/test/resources/webapps/badapp/badapp.xml | 2 +- .../src/test/resources/webapps/bar-core-context-alt.xml | 2 +- .../src/test/resources/webapps/bar-core-context.xml | 2 +- jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml | 2 +- .../jetty-deploy/src/test/resources/webapps/simple.xml | 2 +- jetty-core/jetty-ee/src/main/config/modules/ee-webapp.mod | 2 +- .../jetty-http2-server/src/main/config/etc/jetty-http2.xml | 2 +- .../jetty-http2-server/src/main/config/etc/jetty-http2c.xml | 2 +- .../jetty-http3-server/src/main/config/etc/jetty-http3.xml | 2 +- .../jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml | 2 +- jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml | 2 +- .../src/main/config/modules/jmx.d/jmx-remote-auth.xml | 2 +- .../src/main/config/modules/jmx.d/jmx-remote-ssl.xml | 2 +- jetty-core/jetty-jndi/src/main/config/modules/jndi.mod | 2 +- jetty-core/jetty-openid/src/main/config/modules/openid.mod | 2 +- jetty-core/jetty-plus/src/main/config/modules/plus.mod | 2 +- .../src/main/config/etc/jetty-rewrite-compactpath.xml | 2 +- .../src/main/config/etc/jetty-rewrite-customizer.xml | 2 +- .../jetty-rewrite/src/main/config/etc/jetty-rewrite.xml | 2 +- .../src/main/config/modules/rewrite-compactpath.mod | 2 +- .../src/main/config/modules/rewrite-customizer.mod | 2 +- .../jetty-rewrite/src/main/config/modules/rewrite.mod | 2 +- .../src/main/config/modules/rewrite/jetty-rewrite-rules.xml | 2 +- jetty-core/jetty-server/src/main/config/etc/jetty.xml | 2 +- .../src/main/config/modules/acceptratelimit.mod | 2 +- .../src/main/config/modules/bytebufferpool-quadratic.mod | 2 +- .../src/main/config/modules/connectionlimit.mod | 2 +- .../jetty-server/src/main/config/modules/cross-origin.mod | 2 +- .../src/main/config/modules/customrequestlog.mod | 2 +- jetty-core/jetty-server/src/main/config/modules/debug.mod | 2 +- .../jetty-server/src/main/config/modules/debuglog.mod | 2 +- jetty-core/jetty-server/src/main/config/modules/ext.mod | 2 +- .../jetty-server/src/main/config/modules/graceful.mod | 2 +- jetty-core/jetty-server/src/main/config/modules/gzip.mod | 2 +- .../src/main/config/modules/home-base-warning.mod | 2 +- jetty-core/jetty-server/src/main/config/modules/https.mod | 2 +- .../jetty-server/src/main/config/modules/inetaccess.mod | 2 +- jetty-core/jetty-server/src/main/config/modules/jaas.mod | 2 +- jetty-core/jetty-server/src/main/config/modules/jdbc.mod | 2 +- jetty-core/jetty-server/src/main/config/modules/jvm.mod | 2 +- .../jetty-server/src/main/config/modules/lowresources.mod | 2 +- .../src/main/config/modules/proxy-protocol-ssl.mod | 2 +- .../jetty-server/src/main/config/modules/requestlog.mod | 2 +- .../jetty-server/src/main/config/modules/resources.mod | 2 +- .../src/main/config/modules/secure-redirect.mod | 2 +- .../jetty-server/src/main/config/modules/security.mod | 2 +- .../src/main/config/modules/session-cache-hash.mod | 2 +- .../src/main/config/modules/session-cache-null.mod | 2 +- .../src/main/config/modules/session-store-cache.mod | 2 +- .../src/main/config/modules/session-store-file.mod | 2 +- .../src/main/config/modules/session-store-jdbc.mod | 2 +- .../jetty-server/src/main/config/modules/sessions.mod | 2 +- .../src/main/config/modules/sessions/jdbc/datasource.mod | 2 +- .../src/main/config/modules/sessions/jdbc/driver.mod | 2 +- jetty-core/jetty-server/src/main/config/modules/state.mod | 2 +- .../jetty-server/src/main/config/modules/statistics.mod | 2 +- .../jetty-server/src/main/config/modules/well-known.mod | 2 +- jetty-core/jetty-server/src/main/config/modules/work.mod | 2 +- .../src/test/resources/dist-home/modules/main.mod | 2 +- .../src/main/config/etc/jetty-unixdomain-http.xml | 2 +- .../jetty-util/src/main/config/modules/console-capture.mod | 2 +- jetty-core/jetty-util/src/main/config/modules/pid.mod | 2 +- .../src/main/config/modules/ee10-annotations.mod | 2 +- .../src/main/config/modules/ee10-apache-jsp.mod | 2 +- .../src/main/config/modules/ee10-cdi-decorate.mod | 2 +- .../jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod | 2 +- .../jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod | 2 +- .../src/main/config/modules/ee10-demo-async-rest.mod | 2 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 2 +- .../src/main/webapp/index.html | 2 +- .../src/main/resources/demo/webdefault-ee10.xml | 2 +- .../src/main/resources/exampleserver.xml | 2 +- .../src/main/resources/fileserver.xml | 2 +- .../src/main/config/modules/demo.d/ee10-demo-jaas.xml | 2 +- .../src/main/config/modules/ee10-demo-jaas.mod | 2 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 2 +- .../jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html | 2 +- .../jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html | 2 +- .../src/main/assembly/embedded-jetty-web-for-webbundle.xml | 2 +- .../src/main/config/modules/demo.d/ee10-demo-jetty.xml | 2 +- .../main/config/modules/demo.d/ee10-demo-rewrite-rules.xml | 2 +- .../src/main/config/modules/ee10-demo-jetty.mod | 2 +- .../src/main/config/modules/ee10-demo-rewrite.mod | 2 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 2 +- .../jetty-ee10-demo-jetty-webapp/src/main/webapp/auth.html | 2 +- .../jetty-ee10-demo-jetty-webapp/src/main/webapp/index.html | 2 +- .../src/main/webapp/remote.html | 2 +- .../src/main/webapp/rewrite/info.html | 2 +- .../src/main/config/modules/demo.d/ee10-demo-jndi.xml | 2 +- .../src/main/config/modules/ee10-demo-jndi.mod | 2 +- .../src/main/templates/plugin-context.xml | 2 +- .../src/main/webapp/WEB-INF/jetty-env.xml | 2 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 2 +- .../jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html | 2 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 2 +- .../jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp | 2 +- .../src/main/config/modules/ee10-demo-mock-resources.mod | 2 +- .../src/main/config/modules/ee10-demo-proxy.mod | 2 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 6 +++--- .../src/main/config/modules/demo.d/ee10-demo-spec.xml | 2 +- .../src/main/config/modules/ee10-demo-spec.mod | 2 +- .../src/main/templates/plugin-context.xml | 2 +- .../src/main/webapp/WEB-INF/jetty-env.xml | 2 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 2 +- .../jetty-ee10-demo-spec-webapp/src/main/webapp/index.html | 2 +- .../src/test/jetty-plugin-env.xml | 2 +- .../jetty-ee10-demo-template/src/main/resources/index.html | 2 +- .../src/main/config/modules/ee10-glassfish-jstl.mod | 2 +- .../modules/ee10-jaspi-default-auth-config-factory.mod | 2 +- .../src/main/config/modules/ee10-jaspi-demo.mod | 2 +- .../jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod | 2 +- .../jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod | 2 +- .../jetty-simple-webapp/src/base/modules/ee10-testmod.mod | 2 +- .../jetty-simple-webapp/src/config/jetty-env.xml | 2 +- .../jetty-simple-webapp/src/base/modules/ee10-testmod.mod | 2 +- .../src/main/resources/ee10-maven.mod | 2 +- .../jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml | 2 +- .../test-jetty-ee10-osgi/src/test/config/etc/jetty.xml | 2 +- .../jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod | 2 +- .../src/main/config/modules/ee10-quickstart.mod | 2 +- .../src/main/config/modules/ee10-security.mod | 2 +- .../src/main/config/modules/ee10-servlet.mod | 2 +- .../src/main/config/modules/ee10-servlets.mod | 2 +- .../src/main/config/etc/webdefault-ee10.xml | 2 +- .../src/main/config/modules/ee10-webapp.mod | 2 +- .../WEB-INF/jetty-ee10-web.xml | 2 +- .../webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-web.xml | 2 +- .../webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml | 2 +- .../config/modules/ee10-websocket-jetty-client-webapp.mod | 2 +- .../src/main/config/modules/ee8-annotations.mod | 2 +- .../src/main/config/modules/ee8-apache-jsp.mod | 2 +- .../src/main/config/modules/ee8-demo-async-rest.mod | 2 +- .../src/main/config/modules/ee8-demo-jaas.mod | 2 +- .../src/main/config/modules/ee8-demo-jetty.mod | 2 +- .../src/main/config/modules/ee8-demo-moved-context.mod | 2 +- .../src/main/config/modules/ee8-demo-rewrite.mod | 2 +- .../src/main/config/modules/demo.d/ee8-demo-jndi.xml | 2 +- .../src/main/config/modules/ee8-demo-jndi.mod | 2 +- .../src/main/config/modules/ee8-demo-mock-resources.mod | 2 +- .../src/main/config/modules/ee8-demo-proxy.mod | 2 +- .../src/main/config/modules/demo.d/ee8-demo-spec.xml | 2 +- .../src/main/config/modules/ee8-demo-spec.mod | 2 +- .../src/main/config/modules/ee8-glassfish-jstl.mod | 2 +- .../jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod | 2 +- .../jetty-simple-webapp/src/base/modules/ee8-testmod.mod | 2 +- .../jetty-simple-webapp/src/base/modules/ee8-testmod.mod | 2 +- .../jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod | 2 +- .../jetty-ee8-openid/src/main/config/modules/ee8-openid.mod | 2 +- .../jetty-ee8-osgi-boot/jettyhome/etc/jetty-deploy.xml | 2 +- .../jetty-ee8-osgi-boot/jettyhome/etc/jetty-http.xml | 2 +- .../jetty-ee8-osgi-boot/jettyhome/etc/jetty.xml | 4 ++-- .../test-jetty-ee8-osgi/src/test/config/etc/jetty-alpn.xml | 2 +- .../src/test/config/etc/jetty-deploy.xml | 2 +- .../test/config/etc/jetty-http-boot-context-as-service.xml | 2 +- .../test/config/etc/jetty-http-boot-webapp-as-service.xml | 2 +- .../test/config/etc/jetty-http-boot-with-annotations.xml | 2 +- .../src/test/config/etc/jetty-http-boot-with-bundle.xml | 2 +- .../config/etc/jetty-http-boot-with-javax-websocket.xml | 2 +- .../src/test/config/etc/jetty-http-boot-with-jsp.xml | 2 +- .../src/test/config/etc/jetty-http-boot-with-websocket.xml | 2 +- .../test-jetty-ee8-osgi/src/test/config/etc/jetty-http.xml | 2 +- .../src/test/config/etc/jetty-http2-jdk9.xml | 2 +- .../test-jetty-ee8-osgi/src/test/config/etc/jetty-http2.xml | 2 +- .../test-jetty-ee8-osgi/src/test/config/etc/jetty-https.xml | 2 +- .../test-jetty-ee8-osgi/src/test/config/etc/jetty-ssl.xml | 2 +- .../src/test/config/etc/jetty-testrealm.xml | 2 +- .../src/test/config/etc/jetty-with-custom-class.xml | 2 +- .../test-jetty-ee8-osgi/src/test/config/etc/jetty.xml | 4 ++-- .../jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod | 2 +- .../src/main/config/modules/ee8-quickstart.mod | 2 +- .../src/main/config/modules/ee8-security.mod | 2 +- .../src/main/config/modules/ee8-servlet.mod | 2 +- .../src/main/config/modules/ee8-servlets.mod | 2 +- .../src/main/config/etc/jetty-ee8-deploy.xml | 2 +- .../src/main/config/etc/jetty-ee8-webapp.xml | 2 +- .../jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml | 2 +- .../jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod | 2 +- .../webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-ee8-web.xml | 2 +- .../webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-web.xml | 2 +- .../config/modules/ee8-websocket-jetty-client-webapp.mod | 2 +- .../src/main/config/modules/ee8-websocket-jetty-client.mod | 2 +- .../src/main/config/modules/ee8-websocket-jetty.mod | 2 +- .../src/main/config/modules/ee9-annotations.mod | 2 +- .../src/main/config/modules/ee9-apache-jsp.mod | 2 +- .../src/main/config/modules/ee9-cdi-decorate.mod | 2 +- .../jetty-ee9-cdi/src/main/config/modules/ee9-cdi-spi.mod | 2 +- jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi.mod | 2 +- .../src/main/config/modules/ee9-demo-async-rest.mod | 2 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 2 +- .../src/main/webapp/index.html | 2 +- .../src/main/resources/demo/webdefault-ee9.xml | 2 +- .../src/main/config/modules/ee9-demo-jaas.mod | 2 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 2 +- .../jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html | 2 +- .../jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html | 2 +- .../src/main/assembly/embedded-jetty-web-for-webbundle.xml | 2 +- .../src/main/config/modules/demo.d/ee9-demo-jetty.xml | 2 +- .../main/config/modules/demo.d/ee9-demo-rewrite-rules.xml | 2 +- .../src/main/config/modules/ee9-demo-jetty.mod | 2 +- .../src/main/config/modules/ee9-demo-rewrite.mod | 2 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 2 +- .../jetty-ee9-demo-jetty-webapp/src/main/webapp/auth.html | 2 +- .../jetty-ee9-demo-jetty-webapp/src/main/webapp/index.html | 2 +- .../jetty-ee9-demo-jetty-webapp/src/main/webapp/remote.html | 2 +- .../src/main/webapp/rewrite/info.html | 2 +- .../src/main/config/modules/demo.d/ee9-demo-jndi.xml | 2 +- .../src/main/config/modules/ee9-demo-jndi.mod | 2 +- .../src/main/templates/jetty-test-jndi-header.xml | 2 +- .../src/main/templates/plugin-context.xml | 2 +- .../jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html | 2 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 2 +- .../jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp | 2 +- .../src/main/config/modules/ee9-demo-mock-resources.mod | 2 +- .../src/main/config/modules/ee9-demo-proxy.mod | 2 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 6 +++--- .../src/main/config/modules/ee9-demo-spec.mod | 2 +- .../jetty-ee9-demo-spec-webapp/src/main/webapp/index.html | 2 +- .../jetty-ee9-demo-template/src/main/resources/index.html | 2 +- .../src/main/config/modules/ee9-glassfish-jstl.mod | 2 +- .../modules/ee9-jaspi-default-auth-config-factory.mod | 2 +- .../src/main/config/modules/ee9-jaspi-demo.mod | 2 +- .../jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod | 2 +- .../jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod | 2 +- .../jetty-simple-webapp/src/base/modules/ee9-testmod.mod | 2 +- .../jetty-simple-webapp/src/base/modules/ee9-testmod.mod | 2 +- .../jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod | 2 +- .../jetty-ee9-openid/src/main/config/modules/ee9-openid.mod | 2 +- .../jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml | 2 +- .../jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml | 2 +- .../jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml | 4 ++-- .../test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml | 2 +- .../src/test/config/etc/jetty-deploy.xml | 2 +- .../test/config/etc/jetty-http-boot-context-as-service.xml | 2 +- .../test/config/etc/jetty-http-boot-webapp-as-service.xml | 2 +- .../test/config/etc/jetty-http-boot-with-annotations.xml | 2 +- .../src/test/config/etc/jetty-http-boot-with-bundle.xml | 2 +- .../config/etc/jetty-http-boot-with-jakarta-websocket.xml | 2 +- .../src/test/config/etc/jetty-http-boot-with-jsp.xml | 2 +- .../src/test/config/etc/jetty-http-boot-with-websocket.xml | 2 +- .../test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml | 2 +- .../src/test/config/etc/jetty-http2-jdk9.xml | 2 +- .../test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml | 2 +- .../test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml | 2 +- .../test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml | 2 +- .../src/test/config/etc/jetty-testrealm.xml | 2 +- .../src/test/config/etc/jetty-with-custom-class.xml | 2 +- .../test-jetty-ee9-osgi/src/test/config/etc/jetty.xml | 4 ++-- .../jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml | 2 +- .../jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod | 2 +- .../src/main/config/modules/ee9-quickstart.mod | 2 +- .../src/main/config/modules/ee9-security.mod | 2 +- .../src/main/config/modules/ee9-servlet.mod | 2 +- .../src/main/config/modules/ee9-servlets.mod | 2 +- .../jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml | 2 +- .../jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod | 2 +- .../webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-ee9-web.xml | 2 +- .../webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-web.xml | 2 +- .../webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml | 2 +- .../config/modules/ee9-websocket-jetty-client-webapp.mod | 2 +- jetty-home/src/main/resources/modules/core-demos.mod | 2 +- jetty-home/src/main/resources/modules/demo-jaas.mod | 2 +- .../src/main/resources/modules/demo-moved-context.mod | 2 +- jetty-home/src/main/resources/modules/demo-realm.mod | 2 +- jetty-home/src/main/resources/modules/demo-root.mod | 2 +- .../src/main/resources/modules/demo.d/moved/index.html | 2 +- jetty-home/src/main/resources/modules/demos.mod | 2 +- jetty-home/src/main/resources/modules/disable-urlcache.mod | 2 +- jetty-home/src/main/resources/modules/ee10-demos.mod | 2 +- jetty-home/src/main/resources/modules/ee10-jsp.mod | 2 +- jetty-home/src/main/resources/modules/ee10-jstl.mod | 2 +- jetty-home/src/main/resources/modules/ee8-demos.mod | 2 +- jetty-home/src/main/resources/modules/ee8-jsp.mod | 2 +- jetty-home/src/main/resources/modules/ee8-jstl.mod | 2 +- jetty-home/src/main/resources/modules/ee9-demos.mod | 2 +- jetty-home/src/main/resources/modules/ee9-jsp.mod | 2 +- jetty-home/src/main/resources/modules/ee9-jstl.mod | 2 +- .../src/main/resources/modules/logging-jcl-capture.mod | 2 +- jetty-home/src/main/resources/modules/logging-jetty.mod | 2 +- .../src/main/resources/modules/logging-jul-capture.mod | 2 +- jetty-home/src/main/resources/modules/logging-jul.mod | 2 +- .../src/main/resources/modules/logging-log4j1-capture.mod | 2 +- jetty-home/src/main/resources/modules/logging-log4j1.mod | 2 +- jetty-home/src/main/resources/modules/logging-log4j2.mod | 2 +- jetty-home/src/main/resources/modules/logging-logback.mod | 2 +- jetty-home/src/main/resources/modules/logging-noop.mod | 2 +- jetty-home/src/main/resources/modules/logging/slf4j.mod | 2 +- jetty-home/src/main/resources/modules/stop.mod | 2 +- .../config-template/etc/sessions/gcloud/session-store.xml | 2 +- .../src/main/config-template/modules/gcloud-datastore.mod | 2 +- .../src/main/config-template/modules/gcloud.mod | 2 +- .../main/config-template/modules/session-store-gcloud.mod | 2 +- .../src/main/config/etc/sessions/hazelcast/default.xml | 2 +- .../src/main/config/etc/sessions/hazelcast/remote.xml | 2 +- .../config/modules/session-store-hazelcast-embedded.mod | 2 +- .../main/config/modules/session-store-hazelcast-remote.mod | 2 +- .../config/etc/sessions/infinispan/infinispan-common.xml | 2 +- .../etc/sessions/infinispan/infinispan-embedded-query.xml | 2 +- .../etc/sessions/infinispan/infinispan-embedded.xml | 2 +- .../etc/sessions/infinispan/infinispan-remote-query.xml | 2 +- .../etc/sessions/infinispan/infinispan-remote.xml | 2 +- .../config/etc/sessions/session-data-cache/xmemcached.xml | 2 +- .../modules/sessions/session-data-cache/xmemcached.mod | 2 +- .../config/etc/sessions/mongo/session-store-by-address.xml | 2 +- .../main/config/etc/sessions/mongo/session-store-by-uri.xml | 2 +- .../src/main/config/modules/session-store-mongo.mod | 2 +- .../src/main/config/modules/sessions/mongo/address.mod | 2 +- .../src/main/config/modules/sessions/mongo/uri.mod | 2 +- pom.xml | 2 +- .../ccd-tests/src/test/resources/install-ccd-handler.xml | 2 +- .../eclipse/jetty/tests/distribution/DistributionTests.java | 2 +- 325 files changed, 334 insertions(+), 334 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index d61a2c061cc..1fc19f4958e 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: true contact_links: - name: Jetty Security Reports - url: https://eclipse.dev/jetty/security_reports.php + url: https://jetty.org/security.html about: Please raise security issues here. diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md index bded56c3883..5515ded1dc2 100644 --- a/.github/ISSUE_TEMPLATE/issue-template.md +++ b/.github/ISSUE_TEMPLATE/issue-template.md @@ -18,7 +18,7 @@ labels: Bug **OS type/version** **Description** - + **How to reproduce?** diff --git a/.github/ISSUE_TEMPLATE/release-template.md b/.github/ISSUE_TEMPLATE/release-template.md index a6751fecdbd..b0aace9b047 100644 --- a/.github/ISSUE_TEMPLATE/release-template.md +++ b/.github/ISSUE_TEMPLATE/release-template.md @@ -56,7 +56,7 @@ This release process will produce releases: - [ ] Merge release branches back to main branches and delete release branches. - [ ] Verify release existence in Maven Central by triggering the Jenkins builds of CometD. - [ ] Update Jetty versions on the website ( follow instructions in [jetty-website](https://github.com/eclipse/jetty-website/blob/master/README.md) ). - + [ ] Update (or check) [Download](https://eclipse.dev/jetty/download.php) page is updated. + + [ ] Update (or check) [Download](https://jetty.org/download.html) page is updated. + [ ] Update (or check) documentation page(s) are updated. - [ ] Publish GitHub Releases. - [ ] Prepare release announcement for mailing lists. diff --git a/jetty-core/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml b/jetty-core/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml index b1cb065aff6..a5a49056c59 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-client/src/main/config/modules/client.mod b/jetty-core/jetty-client/src/main/config/modules/client.mod index 1287200826d..fa8da61d182 100644 --- a/jetty-core/jetty-client/src/main/config/modules/client.mod +++ b/jetty-core/jetty-client/src/main/config/modules/client.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds the Jetty HTTP client to the server classpath. diff --git a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo-handler.mod b/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo-handler.mod index 966de59a45e..302b633a34c 100644 --- a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo-handler.mod +++ b/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo-handler.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo Handler diff --git a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml b/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml index f3cef898b6d..0f0f7c07521 100644 --- a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml +++ b/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml b/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml index 551fcc99b9a..e4d6b0c4aca 100644 --- a/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml +++ b/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-core/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-core/jetty-deploy/src/main/config/etc/jetty-deploy.xml index 2ed9f8182d6..02d9dc90209 100644 --- a/jetty-core/jetty-deploy/src/main/config/etc/jetty-deploy.xml +++ b/jetty-core/jetty-deploy/src/main/config/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-deploy/src/test/resources/etc/core-context.xml b/jetty-core/jetty-deploy/src/test/resources/etc/core-context.xml index 1eb453c7599..cccca5c2950 100644 --- a/jetty-core/jetty-deploy/src/test/resources/etc/core-context.xml +++ b/jetty-core/jetty-deploy/src/test/resources/etc/core-context.xml @@ -12,7 +12,7 @@ - + /global diff --git a/jetty-core/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml b/jetty-core/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml index 7d4899bd907..0b3431bd222 100644 --- a/jetty-core/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml +++ b/jetty-core/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-deploy/src/test/resources/jetty-http.xml b/jetty-core/jetty-deploy/src/test/resources/jetty-http.xml index aec2b1b9891..8ee14df91ae 100644 --- a/jetty-core/jetty-deploy/src/test/resources/jetty-http.xml +++ b/jetty-core/jetty-deploy/src/test/resources/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-deploy/src/test/resources/jetty.xml b/jetty-core/jetty-deploy/src/test/resources/jetty.xml index e477b2820c7..849410ab404 100644 --- a/jetty-core/jetty-deploy/src/test/resources/jetty.xml +++ b/jetty-core/jetty-deploy/src/test/resources/jetty.xml @@ -1,9 +1,9 @@ - + - + diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml index 16e071f40ab..a3ce9058a67 100644 --- a/jetty-core/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml +++ b/jetty-core/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context-alt.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context-alt.xml index 41787f99ed0..4aad41739be 100644 --- a/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context-alt.xml +++ b/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context-alt.xml @@ -1,5 +1,5 @@ - + /bar diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context.xml index 8af6129f3b4..72731f08c4d 100644 --- a/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context.xml +++ b/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context.xml @@ -1,5 +1,5 @@ - + /bar diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml index dfadf9a005a..e8c94f70b64 100644 --- a/jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml +++ b/jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml @@ -1,5 +1,5 @@ - + /foo diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/simple.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/simple.xml index a83ffeafa26..3aac3b00214 100644 --- a/jetty-core/jetty-deploy/src/test/resources/webapps/simple.xml +++ b/jetty-core/jetty-deploy/src/test/resources/webapps/simple.xml @@ -1,5 +1,5 @@ - + /simple diff --git a/jetty-core/jetty-ee/src/main/config/modules/ee-webapp.mod b/jetty-core/jetty-ee/src/main/config/modules/ee-webapp.mod index db2420cf4f2..4dea06e0eab 100644 --- a/jetty-core/jetty-ee/src/main/config/modules/ee-webapp.mod +++ b/jetty-core/jetty-ee/src/main/config/modules/ee-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] # tag::description[] diff --git a/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml index 0b9fdc6c7b1..a185f7fadca 100644 --- a/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml +++ b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml index 6d0ed5bd00f..71020ac9c88 100644 --- a/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml +++ b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml b/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml index 044b86ad909..82e2ab4eea9 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml +++ b/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml b/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml index aef61105a32..2f517dcfd37 100644 --- a/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml +++ b/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml b/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml index 2dfe691de24..008ad50b3ab 100644 --- a/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml +++ b/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml b/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml index 6f1b65ef6fa..adb2adaf276 100644 --- a/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml +++ b/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml @@ -19,7 +19,7 @@ ~ --> - + diff --git a/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml b/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml index 98c0dfc9eba..78a79d82da2 100644 --- a/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml +++ b/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml @@ -19,7 +19,7 @@ ~ --> - + diff --git a/jetty-core/jetty-jndi/src/main/config/modules/jndi.mod b/jetty-core/jetty-jndi/src/main/config/modules/jndi.mod index 117a02ca0c1..d4cf07a71a5 100644 --- a/jetty-core/jetty-jndi/src/main/config/modules/jndi.mod +++ b/jetty-core/jetty-jndi/src/main/config/modules/jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds the Jetty JNDI implementation to the classpath. diff --git a/jetty-core/jetty-openid/src/main/config/modules/openid.mod b/jetty-core/jetty-openid/src/main/config/modules/openid.mod index ddd36c8ec90..1f75f0478a2 100644 --- a/jetty-core/jetty-openid/src/main/config/modules/openid.mod +++ b/jetty-core/jetty-openid/src/main/config/modules/openid.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds OpenId Connect authentication to the server. diff --git a/jetty-core/jetty-plus/src/main/config/modules/plus.mod b/jetty-core/jetty-plus/src/main/config/modules/plus.mod index 4813575eba3..fe87a55f5bc 100644 --- a/jetty-core/jetty-plus/src/main/config/modules/plus.mod +++ b/jetty-core/jetty-plus/src/main/config/modules/plus.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds the Jetty Plus JNDI support to the classpath. diff --git a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-compactpath.xml b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-compactpath.xml index 2eab21ff751..68fedfc96cb 100644 --- a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-compactpath.xml +++ b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-compactpath.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml index 2dfb8c9c76a..84294a1f051 100644 --- a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml +++ b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml index 9b0d0e3118d..991a7597d23 100644 --- a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml +++ b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod index d0b64c295cb..7a6c1d84ecf 100644 --- a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod +++ b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Add a rule to the rewrite module to compact paths. diff --git a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod index fced4946ee9..374867e4568 100644 --- a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod +++ b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables a rewrite Rules container as a request customizer. diff --git a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite.mod b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite.mod index ba7e9815457..8db323b256f 100644 --- a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite.mod +++ b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds the RewriteHandler to the Handler chain. diff --git a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite/jetty-rewrite-rules.xml b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite/jetty-rewrite-rules.xml index 1bccfe945b1..67d871a0def 100644 --- a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite/jetty-rewrite-rules.xml +++ b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite/jetty-rewrite-rules.xml @@ -1,5 +1,5 @@ - + - + diff --git a/jetty-core/jetty-server/src/main/config/modules/acceptratelimit.mod b/jetty-core/jetty-server/src/main/config/modules/acceptratelimit.mod index 1e2435f4f9c..cf16c6c5a93 100644 --- a/jetty-core/jetty-server/src/main/config/modules/acceptratelimit.mod +++ b/jetty-core/jetty-server/src/main/config/modules/acceptratelimit.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables a server-wide accept rate limit. diff --git a/jetty-core/jetty-server/src/main/config/modules/bytebufferpool-quadratic.mod b/jetty-core/jetty-server/src/main/config/modules/bytebufferpool-quadratic.mod index 962130af6c4..58b93be6de7 100644 --- a/jetty-core/jetty-server/src/main/config/modules/bytebufferpool-quadratic.mod +++ b/jetty-core/jetty-server/src/main/config/modules/bytebufferpool-quadratic.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Configures the ByteBufferPool used by ServerConnectors. diff --git a/jetty-core/jetty-server/src/main/config/modules/connectionlimit.mod b/jetty-core/jetty-server/src/main/config/modules/connectionlimit.mod index 3c7b32d2041..a6d489c0f80 100644 --- a/jetty-core/jetty-server/src/main/config/modules/connectionlimit.mod +++ b/jetty-core/jetty-server/src/main/config/modules/connectionlimit.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables a server-wide connection limit. diff --git a/jetty-core/jetty-server/src/main/config/modules/cross-origin.mod b/jetty-core/jetty-server/src/main/config/modules/cross-origin.mod index c9bf176b41f..d9d4c4a8ce8 100644 --- a/jetty-core/jetty-server/src/main/config/modules/cross-origin.mod +++ b/jetty-core/jetty-server/src/main/config/modules/cross-origin.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables CrossOriginHandler to support the CORS protocol and protect from cross-site request forgery (CSRF) attacks. diff --git a/jetty-core/jetty-server/src/main/config/modules/customrequestlog.mod b/jetty-core/jetty-server/src/main/config/modules/customrequestlog.mod index 710343ee54e..e2b0178d50d 100644 --- a/jetty-core/jetty-server/src/main/config/modules/customrequestlog.mod +++ b/jetty-core/jetty-server/src/main/config/modules/customrequestlog.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Deprecated name for requestlog using custom request logger. diff --git a/jetty-core/jetty-server/src/main/config/modules/debug.mod b/jetty-core/jetty-server/src/main/config/modules/debug.mod index 897dbaa2a4c..b30cc8dde4c 100644 --- a/jetty-core/jetty-server/src/main/config/modules/debug.mod +++ b/jetty-core/jetty-server/src/main/config/modules/debug.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the DebugListener. diff --git a/jetty-core/jetty-server/src/main/config/modules/debuglog.mod b/jetty-core/jetty-server/src/main/config/modules/debuglog.mod index 1a0a3bb36fd..de8ec60b785 100644 --- a/jetty-core/jetty-server/src/main/config/modules/debuglog.mod +++ b/jetty-core/jetty-server/src/main/config/modules/debuglog.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Deprecated Debug Log using DebugHandle. diff --git a/jetty-core/jetty-server/src/main/config/modules/ext.mod b/jetty-core/jetty-server/src/main/config/modules/ext.mod index 6fc42b27cb8..6e99b69621e 100644 --- a/jetty-core/jetty-server/src/main/config/modules/ext.mod +++ b/jetty-core/jetty-server/src/main/config/modules/ext.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds the jar file from $JETTY_HOME/lib/ext and $JETTY_BASE/lib/ext to the server classpath. diff --git a/jetty-core/jetty-server/src/main/config/modules/graceful.mod b/jetty-core/jetty-server/src/main/config/modules/graceful.mod index 03a6d91b8e7..3dccd3c3896 100644 --- a/jetty-core/jetty-server/src/main/config/modules/graceful.mod +++ b/jetty-core/jetty-server/src/main/config/modules/graceful.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables Graceful processing of requests diff --git a/jetty-core/jetty-server/src/main/config/modules/gzip.mod b/jetty-core/jetty-server/src/main/config/modules/gzip.mod index fc3a14a14de..1fe563b62e7 100644 --- a/jetty-core/jetty-server/src/main/config/modules/gzip.mod +++ b/jetty-core/jetty-server/src/main/config/modules/gzip.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables GzipHandler for dynamic gzip compression for the entire server. diff --git a/jetty-core/jetty-server/src/main/config/modules/home-base-warning.mod b/jetty-core/jetty-server/src/main/config/modules/home-base-warning.mod index e4ed15823bb..828b6440995 100644 --- a/jetty-core/jetty-server/src/main/config/modules/home-base-warning.mod +++ b/jetty-core/jetty-server/src/main/config/modules/home-base-warning.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Generates a warning that server has been run from $JETTY_HOME rather than from a $JETTY_BASE. diff --git a/jetty-core/jetty-server/src/main/config/modules/https.mod b/jetty-core/jetty-server/src/main/config/modules/https.mod index 59ae07ca018..aa8ecfe6464 100644 --- a/jetty-core/jetty-server/src/main/config/modules/https.mod +++ b/jetty-core/jetty-server/src/main/config/modules/https.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds HTTPS protocol support to the TLS(SSL) Connector. diff --git a/jetty-core/jetty-server/src/main/config/modules/inetaccess.mod b/jetty-core/jetty-server/src/main/config/modules/inetaccess.mod index acd2ceacfe7..7f2f2cebea8 100644 --- a/jetty-core/jetty-server/src/main/config/modules/inetaccess.mod +++ b/jetty-core/jetty-server/src/main/config/modules/inetaccess.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the InetAccessHandler. diff --git a/jetty-core/jetty-server/src/main/config/modules/jaas.mod b/jetty-core/jetty-server/src/main/config/modules/jaas.mod index 1f969842cd8..4bbc9b79512 100644 --- a/jetty-core/jetty-server/src/main/config/modules/jaas.mod +++ b/jetty-core/jetty-server/src/main/config/modules/jaas.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables JAAS for deployed web applications. diff --git a/jetty-core/jetty-server/src/main/config/modules/jdbc.mod b/jetty-core/jetty-server/src/main/config/modules/jdbc.mod index 2177507f381..9b1b1e56cd2 100644 --- a/jetty-core/jetty-server/src/main/config/modules/jdbc.mod +++ b/jetty-core/jetty-server/src/main/config/modules/jdbc.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the java.sql JPMS module. diff --git a/jetty-core/jetty-server/src/main/config/modules/jvm.mod b/jetty-core/jetty-server/src/main/config/modules/jvm.mod index 578f163b578..7fe320304d4 100644 --- a/jetty-core/jetty-server/src/main/config/modules/jvm.mod +++ b/jetty-core/jetty-server/src/main/config/modules/jvm.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Creates an ini template for setting JVM arguments (eg -Xmx ). diff --git a/jetty-core/jetty-server/src/main/config/modules/lowresources.mod b/jetty-core/jetty-server/src/main/config/modules/lowresources.mod index 6acebbfdcc5..63794baffd9 100644 --- a/jetty-core/jetty-server/src/main/config/modules/lowresources.mod +++ b/jetty-core/jetty-server/src/main/config/modules/lowresources.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables a low resource monitor on the server. diff --git a/jetty-core/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod b/jetty-core/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod index 8c0611c68c6..7b2d478720a 100644 --- a/jetty-core/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod +++ b/jetty-core/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the Proxy Protocol on the TLS(SSL) Connector. diff --git a/jetty-core/jetty-server/src/main/config/modules/requestlog.mod b/jetty-core/jetty-server/src/main/config/modules/requestlog.mod index bb5cb3ce95e..959b83f4411 100644 --- a/jetty-core/jetty-server/src/main/config/modules/requestlog.mod +++ b/jetty-core/jetty-server/src/main/config/modules/requestlog.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Logs requests using CustomRequestLog and AsyncRequestLogWriter. diff --git a/jetty-core/jetty-server/src/main/config/modules/resources.mod b/jetty-core/jetty-server/src/main/config/modules/resources.mod index 9c503c55480..e5c6e6bce22 100644 --- a/jetty-core/jetty-server/src/main/config/modules/resources.mod +++ b/jetty-core/jetty-server/src/main/config/modules/resources.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] # tag::description[] diff --git a/jetty-core/jetty-server/src/main/config/modules/secure-redirect.mod b/jetty-core/jetty-server/src/main/config/modules/secure-redirect.mod index 80e47924cf3..6704508255d 100644 --- a/jetty-core/jetty-server/src/main/config/modules/secure-redirect.mod +++ b/jetty-core/jetty-server/src/main/config/modules/secure-redirect.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enable SecuredRedirectHandler to redirect all http requests to https on the secure port configured in the server.ini file. diff --git a/jetty-core/jetty-server/src/main/config/modules/security.mod b/jetty-core/jetty-server/src/main/config/modules/security.mod index f6bad5e4933..78d2e1d56e1 100644 --- a/jetty-core/jetty-server/src/main/config/modules/security.mod +++ b/jetty-core/jetty-server/src/main/config/modules/security.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds core security handling to the classpath. diff --git a/jetty-core/jetty-server/src/main/config/modules/session-cache-hash.mod b/jetty-core/jetty-server/src/main/config/modules/session-cache-hash.mod index 79c4e753ec2..aaedd0585ed 100644 --- a/jetty-core/jetty-server/src/main/config/modules/session-cache-hash.mod +++ b/jetty-core/jetty-server/src/main/config/modules/session-cache-hash.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enable first level session cache. diff --git a/jetty-core/jetty-server/src/main/config/modules/session-cache-null.mod b/jetty-core/jetty-server/src/main/config/modules/session-cache-null.mod index 4e7af393f3b..e7da2bbb42c 100644 --- a/jetty-core/jetty-server/src/main/config/modules/session-cache-null.mod +++ b/jetty-core/jetty-server/src/main/config/modules/session-cache-null.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] A SessionCache that does not actually cache sessions. diff --git a/jetty-core/jetty-server/src/main/config/modules/session-store-cache.mod b/jetty-core/jetty-server/src/main/config/modules/session-store-cache.mod index 7485b70aa54..67bc582ab97 100644 --- a/jetty-core/jetty-server/src/main/config/modules/session-store-cache.mod +++ b/jetty-core/jetty-server/src/main/config/modules/session-store-cache.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables caching of SessionData in front of a SessionDataStore. diff --git a/jetty-core/jetty-server/src/main/config/modules/session-store-file.mod b/jetty-core/jetty-server/src/main/config/modules/session-store-file.mod index e00163a4883..42f799fbdac 100644 --- a/jetty-core/jetty-server/src/main/config/modules/session-store-file.mod +++ b/jetty-core/jetty-server/src/main/config/modules/session-store-file.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables session persistent storage in files. diff --git a/jetty-core/jetty-server/src/main/config/modules/session-store-jdbc.mod b/jetty-core/jetty-server/src/main/config/modules/session-store-jdbc.mod index 1ed5ef999d3..ab4ea998fd9 100644 --- a/jetty-core/jetty-server/src/main/config/modules/session-store-jdbc.mod +++ b/jetty-core/jetty-server/src/main/config/modules/session-store-jdbc.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables JDBC persistent/distributed session storage. diff --git a/jetty-core/jetty-server/src/main/config/modules/sessions.mod b/jetty-core/jetty-server/src/main/config/modules/sessions.mod index ade7f539642..19adfb8a518 100644 --- a/jetty-core/jetty-server/src/main/config/modules/sessions.mod +++ b/jetty-core/jetty-server/src/main/config/modules/sessions.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables session management. diff --git a/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod b/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod index e60eb16c4ed..ace61f3a77f 100644 --- a/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod +++ b/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] JDBC Datasource connections for session storage. diff --git a/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod b/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod index 4d4af55f330..880ca335561 100644 --- a/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod +++ b/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] JDBC Driver connections for session storage. diff --git a/jetty-core/jetty-server/src/main/config/modules/state.mod b/jetty-core/jetty-server/src/main/config/modules/state.mod index aceeb233c1b..405a2859001 100644 --- a/jetty-core/jetty-server/src/main/config/modules/state.mod +++ b/jetty-core/jetty-server/src/main/config/modules/state.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Creates and updates state file used by jetty.sh diff --git a/jetty-core/jetty-server/src/main/config/modules/statistics.mod b/jetty-core/jetty-server/src/main/config/modules/statistics.mod index 7eb8c22caf2..3009e97c076 100644 --- a/jetty-core/jetty-server/src/main/config/modules/statistics.mod +++ b/jetty-core/jetty-server/src/main/config/modules/statistics.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables statistics collection for the server. diff --git a/jetty-core/jetty-server/src/main/config/modules/well-known.mod b/jetty-core/jetty-server/src/main/config/modules/well-known.mod index 370cc7fbdc6..ab1aabb3e1c 100644 --- a/jetty-core/jetty-server/src/main/config/modules/well-known.mod +++ b/jetty-core/jetty-server/src/main/config/modules/well-known.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Serve static files from a directory for the "/.well-known" context path. diff --git a/jetty-core/jetty-server/src/main/config/modules/work.mod b/jetty-core/jetty-server/src/main/config/modules/work.mod index 0299b7f92f5..c2076a0aec5 100644 --- a/jetty-core/jetty-server/src/main/config/modules/work.mod +++ b/jetty-core/jetty-server/src/main/config/modules/work.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Creates the $JETTY_BASE/work directory as a persistent temp directory. diff --git a/jetty-core/jetty-start/src/test/resources/dist-home/modules/main.mod b/jetty-core/jetty-start/src/test/resources/dist-home/modules/main.mod index 8e398221e85..3d06d4efc22 100644 --- a/jetty-core/jetty-start/src/test/resources/dist-home/modules/main.mod +++ b/jetty-core/jetty-start/src/test/resources/dist-home/modules/main.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Example of a module diff --git a/jetty-core/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml b/jetty-core/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml index 7e7d8beda77..236563eecef 100644 --- a/jetty-core/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml +++ b/jetty-core/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-util/src/main/config/modules/console-capture.mod b/jetty-core/jetty-util/src/main/config/modules/console-capture.mod index 24bb34984c0..0ad212be13c 100644 --- a/jetty-core/jetty-util/src/main/config/modules/console-capture.mod +++ b/jetty-core/jetty-util/src/main/config/modules/console-capture.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Redirects the JVM console stderr and stdout to a rolling log file. diff --git a/jetty-core/jetty-util/src/main/config/modules/pid.mod b/jetty-core/jetty-util/src/main/config/modules/pid.mod index 3e08fc545a9..4b316327d08 100644 --- a/jetty-core/jetty-util/src/main/config/modules/pid.mod +++ b/jetty-core/jetty-util/src/main/config/modules/pid.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Creates the PID file for the Jetty process diff --git a/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod b/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod index c3b24d3716f..dbd7bdf8660 100644 --- a/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod +++ b/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables Annotation scanning for deployed web applications. diff --git a/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod b/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod index e06a1bddb29..1c92cdcb3cc 100644 --- a/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod +++ b/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables use of the apache implementation of JSP. diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod index a5d664bbf6e..b27bce53cca 100644 --- a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod +++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Configures Jetty to use the "CdiDecoratingListener" as the default CDI mode. diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod index 981e689feba..f9d4cdb0e01 100644 --- a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod +++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Configures Jetty to use the "CdiSpiDecorator" as the default CDI mode. diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod index 94d490847a8..800e2043186 100644 --- a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod +++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Provides integration of CDI within webapp to Jetty container object lifecycles. diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod index d015f02487e..8e2bdb27035 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo Async Rest webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 993604c2427..e15d79203dd 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/exampleserver.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/exampleserver.xml index b8056cdbecb..10f6287cd79 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/exampleserver.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/exampleserver.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml index 2fcadfe77b0..613c4136aa1 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/demo.d/ee10-demo-jaas.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/demo.d/ee10-demo-jaas.xml index 1167c1494f6..145fee70d56 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/demo.d/ee10-demo-jaas.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/demo.d/ee10-demo-jaas.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod index c3d1976e4b2..e13f223a5e2 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo EE10 JAAS webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 794ff67798b..0e1cec96bf1 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html index 72ba7989e9a..02f71fa4c0d 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html @@ -36,7 +36,7 @@
-
+
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html index 6db01b4715e..a55d924d80b 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html @@ -28,7 +28,7 @@
-
+
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml index 0c505467149..3123f9016fa 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-jetty.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-jetty.mod index 62ad256f8a3..b79c84e0116 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-jetty.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-jetty.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo Jetty Webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-rewrite.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-rewrite.mod index ef3f514ebce..860c1f5f76f 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-rewrite.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/config/modules/ee10-demo-rewrite.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demonstrate the rewrite module. diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 5a92efcbfaf..5c0d24ce599 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod index c0aa4795c3f..9f604d9b55b 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo JNDI Resources Webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/templates/plugin-context.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/templates/plugin-context.xml index f0d315474e2..9946aea65e3 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/templates/plugin-context.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/templates/plugin-context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml index 87de1f66581..8b65998639c 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml index e8ae7739ec5..50c061efb2c 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html index e0db298c8ea..5f70c5cd192 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html @@ -48,7 +48,7 @@
-
+
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml index ff51f399af0..25c2ff54c6b 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp index dd3b777a159..ab30de70678 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp @@ -39,7 +39,7 @@
-
+
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod index 84498fdb234..d14fa4fbf8e 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Download and install some Demo Mock Resources diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod index ae219aea510..abc696cf1d6 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo Proxy Webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 631a65bbd7d..9ee5860728e 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml index e224e2019e4..545b0a5fa6c 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml @@ -13,11 +13,11 @@ org.eclipse.jetty.ee10.proxy.ProxyServlet$Transparent proxyTo - https://eclipse.dev/jetty/javadoc/jetty-12/index.html?overview-summary.html + https://javadoc.jetty.org/ hostHeader - www.eclipse.org + javadoc.jetty.org 1 true @@ -25,7 +25,7 @@ JavadocTransparentProxy - /current/* + /jetty-12/* diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/demo.d/ee10-demo-spec.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/demo.d/ee10-demo-spec.xml index 8dcba6328a8..fd0034b06ef 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/demo.d/ee10-demo-spec.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/demo.d/ee10-demo-spec.xml @@ -1,5 +1,5 @@ - + /ee10-test-spec diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod index 6b5ebb414d5..9e17bd4c205 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Download and deploy the Test Spec webapp demo. diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/templates/plugin-context.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/templates/plugin-context.xml index 17eb3161d95..98b0666972d 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/templates/plugin-context.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/templates/plugin-context.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml index 00beed6f071..24def7b180a 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 170908cfed3..369ff962ca1 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/index.html index fdb01b55a17..e643e8dc2e8 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/index.html @@ -80,7 +80,7 @@
-
+
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/test/jetty-plugin-env.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/test/jetty-plugin-env.xml index a01523f88c8..435a9723cb5 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/test/jetty-plugin-env.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/test/jetty-plugin-env.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/index.html index d504ae7dc88..1f46d2ac245 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/index.html @@ -29,7 +29,7 @@
-
+
diff --git a/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod b/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod index 18405bc1b14..00bac885f4e 100644 --- a/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod +++ b/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the glassfish version of JSTL for all webapps. diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod index 6a3841ac8f1..ed16406138e 100644 --- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod +++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Provides a DefaultAuthConfigFactory for jaspi diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod index b9342914a66..1c3620204e0 100644 --- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod +++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables JASPI basic authentication the /test context path. diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod index 9b65c07c0b9..15849f2a458 100644 --- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod +++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables JASPI authentication for deployed web applications. diff --git a/jetty-ee10/jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod b/jetty-ee10/jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod index 093f4a0fc3f..094f706dd4a 100644 --- a/jetty-ee10/jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod +++ b/jetty-ee10/jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds the Jetty EE10 JNDI reference factories diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod index 6278dc43d66..3eb1a0ff4e0 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables test setup diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty-env.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty-env.xml index 8d0ddabb112..997664a7734 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty-env.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty-env.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod index 78134aace9c..5a1c1eb3ec1 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables test setup diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod b/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod index ab4ed52419b..05b837a7c51 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables an un-assembled Maven webapp to run in a Jetty distribution. diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml index 322cd7db263..845d7fdb232 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml @@ -6,7 +6,7 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty.xml index ed1e4f3433e..7699aab3efe 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty.xml @@ -6,7 +6,7 @@ - + diff --git a/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod b/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod index e62d7f38b5b..bad7dbb33f2 100644 --- a/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod +++ b/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the Jetty Proxy service. diff --git a/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod b/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod index daacb58fad4..6d388413ac8 100644 --- a/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod +++ b/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the Jetty Quickstart module for rapid deployment of preconfigured web applications. diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod index 19657b869f3..023b86f2255 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod +++ b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds servlet standard security handling to the classpath. diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod index e679f195524..bcffc1cd74f 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod +++ b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables standard Servlet handling. diff --git a/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod b/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod index 7e94e2e48be..d1cb854f543 100644 --- a/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod +++ b/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds Jetty EE10 utility servlets and filters available to a webapp. diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml b/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml index ab19d557272..c0bd143f32e 100644 --- a/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml +++ b/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml @@ -185,7 +185,7 @@ - + diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod b/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod index 229c107f3f3..be1ebbaab73 100644 --- a/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod +++ b/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] # tag::description[] diff --git a/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-ee10-web.xml b/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-ee10-web.xml index beba698c2c9..868909820b7 100644 --- a/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-ee10-web.xml +++ b/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-ee10-web.xml @@ -12,7 +12,7 @@ - + /raspberry diff --git a/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-web.xml index bc6363a9b73..941dd6fc247 100644 --- a/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-web.xml @@ -12,7 +12,7 @@ - + /apple diff --git a/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml index c1fd44b483b..9ba91a2ff38 100644 --- a/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml +++ b/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml @@ -12,7 +12,7 @@ - + /orange diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod index adad3a7fd3d..0ab6236ed35 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Expose the Jetty WebSocket Client classes to deployed web applications. diff --git a/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod b/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod index 539543afec0..c04356eddb7 100644 --- a/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod +++ b/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables Annotation scanning for deployed web applications. diff --git a/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod b/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod index 1680801a899..b754bfb3c6d 100644 --- a/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod +++ b/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables use of the apache implementation of JSP. diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/src/main/config/modules/ee8-demo-async-rest.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/src/main/config/modules/ee8-demo-async-rest.mod index ac42cf7bef0..f9883aebfcc 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/src/main/config/modules/ee8-demo-async-rest.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/src/main/config/modules/ee8-demo-async-rest.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo Async Rest webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/src/main/config/modules/ee8-demo-jaas.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/src/main/config/modules/ee8-demo-jaas.mod index 81f32b960ea..1248ba55e1c 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/src/main/config/modules/ee8-demo-jaas.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/src/main/config/modules/ee8-demo-jaas.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo EE8 JAAS webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-jetty.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-jetty.mod index 6bbd2313074..8d9db6dc390 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-jetty.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-jetty.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo Jetty Webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-moved-context.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-moved-context.mod index 18a631c2da3..aa0923701b2 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-moved-context.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-moved-context.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demonstrate a Moved Context Handler. diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-rewrite.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-rewrite.mod index d5c75002682..1128f08b3e0 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-rewrite.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/ee8-demo-rewrite.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demonstrate the rewrite module. diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/demo.d/ee8-demo-jndi.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/demo.d/ee8-demo-jndi.xml index 212fe13c2cf..02101e01bf1 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/demo.d/ee8-demo-jndi.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/demo.d/ee8-demo-jndi.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/ee8-demo-jndi.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/ee8-demo-jndi.mod index 24b9850ce6c..680a16a159e 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/ee8-demo-jndi.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/src/main/config/modules/ee8-demo-jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo JNDI Resources Webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/src/main/config/modules/ee8-demo-mock-resources.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/src/main/config/modules/ee8-demo-mock-resources.mod index d6b26a5d05d..19c10b93a02 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/src/main/config/modules/ee8-demo-mock-resources.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/src/main/config/modules/ee8-demo-mock-resources.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Download and install some Demo Mock Resources diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/src/main/config/modules/ee8-demo-proxy.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/src/main/config/modules/ee8-demo-proxy.mod index f7ad5f95122..c65f65d41f1 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/src/main/config/modules/ee8-demo-proxy.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/src/main/config/modules/ee8-demo-proxy.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo Proxy Webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/demo.d/ee8-demo-spec.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/demo.d/ee8-demo-spec.xml index eacab533cb4..bb573d65f85 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/demo.d/ee8-demo-spec.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/demo.d/ee8-demo-spec.xml @@ -1,5 +1,5 @@ - + /ee8-test-spec diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/ee8-demo-spec.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/ee8-demo-spec.mod index c665d14aa29..53e2f4082b5 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/ee8-demo-spec.mod +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/src/main/config/modules/ee8-demo-spec.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Download and deploy the Test Spec webapp demo. diff --git a/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod b/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod index 7c2ac4e540c..72c7a59f4cd 100644 --- a/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod +++ b/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the glassfish version of JSTL for all webapps. diff --git a/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod b/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod index 05f2e868dc0..87dab7aba2d 100644 --- a/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod +++ b/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds the Jetty EE8 JNDI reference factories diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod index a2fc225ca68..d44f9142ab5 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod +++ b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables test setup diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod index 604ee1f920f..ad72ff8faa2 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod +++ b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables test setup diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod b/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod index e16db22ed87..45572442786 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod +++ b/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables an un-assembled Maven webapp to run in a Jetty distribution. diff --git a/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod b/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod index b68eb35ac3d..dc9d5fd3e1e 100644 --- a/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod +++ b/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds OpenId Connect authentication to the server. diff --git a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-deploy.xml b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-deploy.xml index 88fc1a79e59..1396a86176a 100644 --- a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-deploy.xml +++ b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-http.xml b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-http.xml index bbd9ab19ed5..3387ed855d3 100644 --- a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-http.xml +++ b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty.xml b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty.xml index a2e40523909..f7fa7e0ac8b 100644 --- a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty.xml @@ -1,11 +1,11 @@ - + - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-alpn.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-alpn.xml index f07dfa10807..bc73c4d1ffe 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-alpn.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-alpn.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-deploy.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-deploy.xml index 21d724916da..5b21201dd8e 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-deploy.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml index 368b7b13f04..167bdfa2cc8 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml index 0f8a95f6ba2..817c79209b8 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml index 2f192b9ad76..71b58edf4f0 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml index 55833c5cdd6..d558f458706 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml index 48e9f5b3189..8d129694a35 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml index 250f55485ff..163764abea1 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml index c5a60d87957..1b8421df4f3 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http.xml index a98af21f658..b2e21f7755b 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2-jdk9.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2-jdk9.xml index 8bcf77c3992..a5eca60f996 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2-jdk9.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2-jdk9.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2.xml index 750062e2bfd..f3cbd267a76 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-https.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-https.xml index 58901463ac2..c8d9cefffb5 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-https.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-https.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-ssl.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-ssl.xml index e76e7cfda34..801de9e53a5 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-ssl.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-testrealm.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-testrealm.xml index aa5a5b7d6d8..43fd283c9cc 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-testrealm.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-testrealm.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-with-custom-class.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-with-custom-class.xml index 5ee75015be6..89796c75e19 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-with-custom-class.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-with-custom-class.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty.xml index 3042e2e31d5..e23cd91bf37 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty.xml @@ -1,12 +1,12 @@ - + - + diff --git a/jetty-ee8/jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod b/jetty-ee8/jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod index 372c4e5f1bd..0514972615e 100644 --- a/jetty-ee8/jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod +++ b/jetty-ee8/jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the Jetty Proxy service. diff --git a/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod b/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod index c4f50ab8f39..a079864d9b7 100644 --- a/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod +++ b/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the Jetty Quickstart module for rapid deployment of preconfigured web applications. diff --git a/jetty-ee8/jetty-ee8-security/src/main/config/modules/ee8-security.mod b/jetty-ee8/jetty-ee8-security/src/main/config/modules/ee8-security.mod index 5e786362647..c82b51df319 100644 --- a/jetty-ee8/jetty-ee8-security/src/main/config/modules/ee8-security.mod +++ b/jetty-ee8/jetty-ee8-security/src/main/config/modules/ee8-security.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds servlet standard security handling to the classpath. diff --git a/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod b/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod index ef6c975365f..b49ef65940b 100644 --- a/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod +++ b/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables standard Servlet handling. diff --git a/jetty-ee8/jetty-ee8-servlets/src/main/config/modules/ee8-servlets.mod b/jetty-ee8/jetty-ee8-servlets/src/main/config/modules/ee8-servlets.mod index dd6fd652a85..c14366cb8ba 100644 --- a/jetty-ee8/jetty-ee8-servlets/src/main/config/modules/ee8-servlets.mod +++ b/jetty-ee8/jetty-ee8-servlets/src/main/config/modules/ee8-servlets.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds Jetty EE8 utility servlets and filters available to a webapp. diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml index 52fb1adae48..ef89f770e7b 100644 --- a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml +++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-webapp.xml b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-webapp.xml index d041fcdb3f8..f77acad54e5 100644 --- a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-webapp.xml +++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-webapp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml index aadae3cbb13..33dbbfc802e 100644 --- a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml +++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml @@ -187,7 +187,7 @@ - + diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod b/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod index f1bd99183c8..6f5843f9575 100644 --- a/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod +++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds support for servlet specification web applications to the server classpath. diff --git a/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-ee8-web.xml b/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-ee8-web.xml index 75eb7ab66d9..04339583062 100644 --- a/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-ee8-web.xml +++ b/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-ee8-web.xml @@ -12,7 +12,7 @@ - + /raspberry diff --git a/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-web.xml b/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-web.xml index 4cebf8aca2f..33546a81d30 100644 --- a/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-web.xml +++ b/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-web.xml @@ -12,7 +12,7 @@ - + /apple diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod index 2daec2f617b..803d0b8eba9 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Expose the Jetty WebSocket Client classes to deployed web applications. diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod index 6a5e53290fd..630874a96ac 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Expose the Jetty WebSocket Client classes to deployed web applications. diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod index 56a17d48d74..7d19b4c8806 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enable the Jetty WebSocket API support for deployed web applications. diff --git a/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod b/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod index 28e42669814..4f40d35b257 100644 --- a/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod +++ b/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables Annotation scanning for deployed web applications. diff --git a/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod b/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod index b942a5d7982..ffad9a7f068 100644 --- a/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod +++ b/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables use of the apache implementation of JSP. diff --git a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-decorate.mod b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-decorate.mod index d2855107fdb..263b4aa87ce 100644 --- a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-decorate.mod +++ b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-decorate.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Configures Jetty to use the "CdiDecoratingListener" as the default CDI mode. diff --git a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-spi.mod b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-spi.mod index a46b9f8461c..dc581e8c9d9 100644 --- a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-spi.mod +++ b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-spi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Configures Jetty to use the "CdiSpiDecorator" as the default CDI mode. diff --git a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi.mod b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi.mod index 45a8d13752c..a94e3986c7a 100644 --- a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi.mod +++ b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Provides integration of CDI within webapp to Jetty container object lifecycles. diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/config/modules/ee9-demo-async-rest.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/config/modules/ee9-demo-async-rest.mod index 7b3fd77221d..88a6ea8cd41 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/config/modules/ee9-demo-async-rest.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/config/modules/ee9-demo-async-rest.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo Async Rest webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml index d6abf37f497..1cd200461f8 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/config/modules/ee9-demo-jaas.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/config/modules/ee9-demo-jaas.mod index 20f7a11e720..ba6cb517bd0 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/config/modules/ee9-demo-jaas.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/config/modules/ee9-demo-jaas.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo EE9 JAAS webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml index c979828b30b..968d3551284 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html index 061afd687fa..f5f6258523a 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html @@ -36,7 +36,7 @@
-
+
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html index 45f4b9e9d31..ea9df7f01ad 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html @@ -28,7 +28,7 @@
-
+
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml index ba842025ad2..64c70694ec8 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod index 43e90e8d890..f12ed153eec 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo Jetty Webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-rewrite.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-rewrite.mod index 433ed68d12e..db8116096ba 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-rewrite.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-rewrite.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demonstrate the rewrite module. diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 976016cc6bc..2a70e8eccb7 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod index 5d5f3244d58..d271e621dd0 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo JNDI Resources Webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml index b8cc80a3fb9..aae9dce1925 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/plugin-context.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/plugin-context.xml index 736fcd5769b..452ea765bae 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/plugin-context.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/templates/plugin-context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html index 59f12e42e21..7e97435c9de 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html @@ -48,7 +48,7 @@
-
+
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml index de6fa8e5426..ae27ece3b01 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp index 2d6c868bf79..7067c84e31a 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp @@ -39,7 +39,7 @@
-
+
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod index 4d4560395d4..2d9ab6c33b4 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Download and install some Demo Mock Resources diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/config/modules/ee9-demo-proxy.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/config/modules/ee9-demo-proxy.mod index 519c5cfb5d6..f0ecb0dadfc 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/config/modules/ee9-demo-proxy.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/config/modules/ee9-demo-proxy.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo Proxy Webapp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 3f52695fefe..308c423dda0 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml index 8d832bd8372..75f2d4904de 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml @@ -13,11 +13,11 @@ org.eclipse.jetty.ee9.proxy.ProxyServlet$Transparent proxyTo - https://eclipse.dev/jetty/javadoc/jetty-12/index.html?overview-summary.html + https://javadoc.jetty.org/ hostHeader - www.eclipse.org + javadoc.jetty.org 1 true @@ -25,7 +25,7 @@ JavadocTransparentProxy - /current/* + /jetty-12/* diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod index 502d3ba67b3..54010b0bdc6 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Download and deploy the Test Spec webapp demo. diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/index.html index 0f2a64eda3b..ffd47523879 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/index.html @@ -80,7 +80,7 @@
-
+
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html index 94372ac548b..30e9e453371 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html @@ -29,7 +29,7 @@
-
+
diff --git a/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod b/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod index 82bbb833ea0..490cc60a09d 100644 --- a/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod +++ b/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the glassfish version of JSTL for all webapps. diff --git a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-default-auth-config-factory.mod b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-default-auth-config-factory.mod index 39762bc79f9..ce713d57ba4 100644 --- a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-default-auth-config-factory.mod +++ b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-default-auth-config-factory.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Provides a DefaultAuthConfigFactory for jaspi diff --git a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-demo.mod b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-demo.mod index 4ba345f9752..74ac84779df 100644 --- a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-demo.mod +++ b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-demo.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables JASPI basic authentication the /test context path. diff --git a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod index 071f79a1a9e..5232d7f06f7 100644 --- a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod +++ b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables JASPI authentication for deployed web applications. diff --git a/jetty-ee9/jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod b/jetty-ee9/jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod index 1c2e7d6e653..938ffe936ec 100644 --- a/jetty-ee9/jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod +++ b/jetty-ee9/jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds the Jetty EE9 JNDI reference factories diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod index 5e40e47dbbf..082129567a1 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables test setup diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod index efc4adfa0c9..294a7062af3 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables test setup diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod b/jetty-ee9/jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod index 4eee3f1211f..5ad679e3a67 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables an un-assembled Maven webapp to run in a Jetty distribution. diff --git a/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod b/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod index d86a075bc8b..099b4769feb 100644 --- a/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod +++ b/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds OpenId Connect authentication to the server. diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml index 88fc1a79e59..1396a86176a 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml index bbd9ab19ed5..3387ed855d3 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml index a2e40523909..f7fa7e0ac8b 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml @@ -1,11 +1,11 @@ - + - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml index f07dfa10807..bc73c4d1ffe 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-deploy.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-deploy.xml index 21d724916da..5b21201dd8e 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-deploy.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml index 368b7b13f04..167bdfa2cc8 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml index 0f8a95f6ba2..817c79209b8 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml index 2f192b9ad76..71b58edf4f0 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml index 55833c5cdd6..d558f458706 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml index 7ed60324940..0f85ffc426a 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml index 250f55485ff..163764abea1 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml index c5a60d87957..1b8421df4f3 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml index 03817aee22a..ac9daa6b5d7 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2-jdk9.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2-jdk9.xml index fe6ec6306b2..4bf134cec4b 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2-jdk9.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2-jdk9.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml index 750062e2bfd..f3cbd267a76 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml index 4ea09074388..0131aa42bbe 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml index e76e7cfda34..801de9e53a5 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-testrealm.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-testrealm.xml index b7af3243b8e..0d90ab0259b 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-testrealm.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-testrealm.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-with-custom-class.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-with-custom-class.xml index b9539aa864e..d730f60aa54 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-with-custom-class.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-with-custom-class.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty.xml index 3042e2e31d5..e23cd91bf37 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty.xml @@ -1,12 +1,12 @@ - + - + diff --git a/jetty-ee9/jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml b/jetty-ee9/jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml index 746d13edf87..f919ef7fc88 100644 --- a/jetty-ee9/jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml +++ b/jetty-ee9/jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod b/jetty-ee9/jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod index 9e8dd912cae..494520be45b 100644 --- a/jetty-ee9/jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod +++ b/jetty-ee9/jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the Jetty Proxy service. diff --git a/jetty-ee9/jetty-ee9-quickstart/src/main/config/modules/ee9-quickstart.mod b/jetty-ee9/jetty-ee9-quickstart/src/main/config/modules/ee9-quickstart.mod index 76931992e2d..4b383ec2ff7 100644 --- a/jetty-ee9/jetty-ee9-quickstart/src/main/config/modules/ee9-quickstart.mod +++ b/jetty-ee9/jetty-ee9-quickstart/src/main/config/modules/ee9-quickstart.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables the Jetty Quickstart module for rapid deployment of preconfigured web applications. diff --git a/jetty-ee9/jetty-ee9-security/src/main/config/modules/ee9-security.mod b/jetty-ee9/jetty-ee9-security/src/main/config/modules/ee9-security.mod index a16d6791250..92ecf5d5ba9 100644 --- a/jetty-ee9/jetty-ee9-security/src/main/config/modules/ee9-security.mod +++ b/jetty-ee9/jetty-ee9-security/src/main/config/modules/ee9-security.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds servlet standard security handling to the classpath. diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod b/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod index 4066aee5d99..1993eb6216d 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod +++ b/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables standard Servlet handling. diff --git a/jetty-ee9/jetty-ee9-servlets/src/main/config/modules/ee9-servlets.mod b/jetty-ee9/jetty-ee9-servlets/src/main/config/modules/ee9-servlets.mod index cb5fd4b40b3..d54df1af88e 100644 --- a/jetty-ee9/jetty-ee9-servlets/src/main/config/modules/ee9-servlets.mod +++ b/jetty-ee9/jetty-ee9-servlets/src/main/config/modules/ee9-servlets.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds Jetty EE9 utility servlets and filters available to a webapp. diff --git a/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml b/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml index d1364eb7851..d84351180c1 100644 --- a/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml +++ b/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml @@ -187,7 +187,7 @@ - + diff --git a/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod b/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod index 56301513d11..f72bd381ebc 100644 --- a/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod +++ b/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Adds support for servlet specification web applications to the server classpath. diff --git a/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-ee9-web.xml b/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-ee9-web.xml index 68227056378..cc95fdb2260 100644 --- a/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-ee9-web.xml +++ b/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-ee9-web.xml @@ -12,7 +12,7 @@ - + /raspberry diff --git a/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-web.xml index 517bef72c45..641fc93e913 100644 --- a/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-web.xml @@ -12,7 +12,7 @@ - + /apple diff --git a/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml index 90d5ac4e64a..d2f6885ba0b 100644 --- a/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml @@ -12,7 +12,7 @@ - + /orange diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod index 128a6ae3a6f..d4087de6a0f 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Expose the Jetty WebSocket Client classes to deployed web applications. diff --git a/jetty-home/src/main/resources/modules/core-demos.mod b/jetty-home/src/main/resources/modules/core-demos.mod index 9928322ca0b..4af7fa251f7 100644 --- a/jetty-home/src/main/resources/modules/core-demos.mod +++ b/jetty-home/src/main/resources/modules/core-demos.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] A meta module to enable all core demo modules. diff --git a/jetty-home/src/main/resources/modules/demo-jaas.mod b/jetty-home/src/main/resources/modules/demo-jaas.mod index ec8c8351b84..7119a7868a7 100644 --- a/jetty-home/src/main/resources/modules/demo-jaas.mod +++ b/jetty-home/src/main/resources/modules/demo-jaas.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Setup for jaas demos. diff --git a/jetty-home/src/main/resources/modules/demo-moved-context.mod b/jetty-home/src/main/resources/modules/demo-moved-context.mod index e695fa659a9..1a734f5d6c1 100644 --- a/jetty-home/src/main/resources/modules/demo-moved-context.mod +++ b/jetty-home/src/main/resources/modules/demo-moved-context.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demonstrate a Moved Context Handler setup in XML diff --git a/jetty-home/src/main/resources/modules/demo-realm.mod b/jetty-home/src/main/resources/modules/demo-realm.mod index 808d3fadfeb..c9dc8baefef 100644 --- a/jetty-home/src/main/resources/modules/demo-realm.mod +++ b/jetty-home/src/main/resources/modules/demo-realm.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Configure a demo authentication realm. diff --git a/jetty-home/src/main/resources/modules/demo-root.mod b/jetty-home/src/main/resources/modules/demo-root.mod index c777c4f3060..b8d99a76186 100644 --- a/jetty-home/src/main/resources/modules/demo-root.mod +++ b/jetty-home/src/main/resources/modules/demo-root.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Demo root context. diff --git a/jetty-home/src/main/resources/modules/demo.d/moved/index.html b/jetty-home/src/main/resources/modules/demo.d/moved/index.html index 9cdd2c4ea35..771a1427fd2 100644 --- a/jetty-home/src/main/resources/modules/demo.d/moved/index.html +++ b/jetty-home/src/main/resources/modules/demo.d/moved/index.html @@ -22,7 +22,7 @@
-
+
diff --git a/jetty-home/src/main/resources/modules/demos.mod b/jetty-home/src/main/resources/modules/demos.mod index 226c4801597..47d0d698f7a 100644 --- a/jetty-home/src/main/resources/modules/demos.mod +++ b/jetty-home/src/main/resources/modules/demos.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] A meta module to enable all demo modules. diff --git a/jetty-home/src/main/resources/modules/disable-urlcache.mod b/jetty-home/src/main/resources/modules/disable-urlcache.mod index 92fb9be10f7..a86869ecba6 100644 --- a/jetty-home/src/main/resources/modules/disable-urlcache.mod +++ b/jetty-home/src/main/resources/modules/disable-urlcache.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] A module that will disable java.net.URL internal cache of `jar` protocol URLs. diff --git a/jetty-home/src/main/resources/modules/ee10-demos.mod b/jetty-home/src/main/resources/modules/ee10-demos.mod index 7b977365d95..8e098e96657 100644 --- a/jetty-home/src/main/resources/modules/ee10-demos.mod +++ b/jetty-home/src/main/resources/modules/ee10-demos.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] A meta module to enable all EE10 demo modules. diff --git a/jetty-home/src/main/resources/modules/ee10-jsp.mod b/jetty-home/src/main/resources/modules/ee10-jsp.mod index 5f6bcb2050b..b90105b32f4 100644 --- a/jetty-home/src/main/resources/modules/ee10-jsp.mod +++ b/jetty-home/src/main/resources/modules/ee10-jsp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables JSP for all web applications deployed on the server. diff --git a/jetty-home/src/main/resources/modules/ee10-jstl.mod b/jetty-home/src/main/resources/modules/ee10-jstl.mod index 4aa55bb4969..6ccfb7e7ec8 100644 --- a/jetty-home/src/main/resources/modules/ee10-jstl.mod +++ b/jetty-home/src/main/resources/modules/ee10-jstl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables JSTL for all web applications deployed on the server. diff --git a/jetty-home/src/main/resources/modules/ee8-demos.mod b/jetty-home/src/main/resources/modules/ee8-demos.mod index 71c00121aa8..8b099a4f5a0 100644 --- a/jetty-home/src/main/resources/modules/ee8-demos.mod +++ b/jetty-home/src/main/resources/modules/ee8-demos.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] A meta module to enable all EE8 demo modules. diff --git a/jetty-home/src/main/resources/modules/ee8-jsp.mod b/jetty-home/src/main/resources/modules/ee8-jsp.mod index f98d636dd34..156cd1ba4bd 100644 --- a/jetty-home/src/main/resources/modules/ee8-jsp.mod +++ b/jetty-home/src/main/resources/modules/ee8-jsp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables JSP for all web applications deployed on the server. diff --git a/jetty-home/src/main/resources/modules/ee8-jstl.mod b/jetty-home/src/main/resources/modules/ee8-jstl.mod index a5458d41bd3..a57cf65e538 100644 --- a/jetty-home/src/main/resources/modules/ee8-jstl.mod +++ b/jetty-home/src/main/resources/modules/ee8-jstl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables JSTL for all web applications deployed on the server. diff --git a/jetty-home/src/main/resources/modules/ee9-demos.mod b/jetty-home/src/main/resources/modules/ee9-demos.mod index 06c023136c8..90aa0bd2208 100644 --- a/jetty-home/src/main/resources/modules/ee9-demos.mod +++ b/jetty-home/src/main/resources/modules/ee9-demos.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] A meta module to enable all EE9 demo modules. diff --git a/jetty-home/src/main/resources/modules/ee9-jsp.mod b/jetty-home/src/main/resources/modules/ee9-jsp.mod index 2dbb8d8cac9..4c89a096b17 100644 --- a/jetty-home/src/main/resources/modules/ee9-jsp.mod +++ b/jetty-home/src/main/resources/modules/ee9-jsp.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables JSP for all web applications deployed on the server. diff --git a/jetty-home/src/main/resources/modules/ee9-jstl.mod b/jetty-home/src/main/resources/modules/ee9-jstl.mod index abc388f6b61..885b3736b43 100644 --- a/jetty-home/src/main/resources/modules/ee9-jstl.mod +++ b/jetty-home/src/main/resources/modules/ee9-jstl.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables JSTL for all web applications deployed on the server. diff --git a/jetty-home/src/main/resources/modules/logging-jcl-capture.mod b/jetty-home/src/main/resources/modules/logging-jcl-capture.mod index 5ef75a8d856..9f0adeeca03 100644 --- a/jetty-home/src/main/resources/modules/logging-jcl-capture.mod +++ b/jetty-home/src/main/resources/modules/logging-jcl-capture.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Captures jakarta-commons-logging events and bridges them to SLF4J. diff --git a/jetty-home/src/main/resources/modules/logging-jetty.mod b/jetty-home/src/main/resources/modules/logging-jetty.mod index c068913f00f..7aaebb11812 100644 --- a/jetty-home/src/main/resources/modules/logging-jetty.mod +++ b/jetty-home/src/main/resources/modules/logging-jetty.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Base configuration for the jetty logging mechanism. diff --git a/jetty-home/src/main/resources/modules/logging-jul-capture.mod b/jetty-home/src/main/resources/modules/logging-jul-capture.mod index efd6103d94f..adc89b97b12 100644 --- a/jetty-home/src/main/resources/modules/logging-jul-capture.mod +++ b/jetty-home/src/main/resources/modules/logging-jul-capture.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Captures java.util.logging events and bridges them to slf4j. diff --git a/jetty-home/src/main/resources/modules/logging-jul.mod b/jetty-home/src/main/resources/modules/logging-jul.mod index 87e950b25ce..cb6ef021278 100644 --- a/jetty-home/src/main/resources/modules/logging-jul.mod +++ b/jetty-home/src/main/resources/modules/logging-jul.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Configures jetty logging to use Java Util Logging (jul). diff --git a/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod b/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod index 9e1ca062248..f3d29c836a2 100644 --- a/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod +++ b/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Captures Apache log4j events and bridges them to SLF4J. diff --git a/jetty-home/src/main/resources/modules/logging-log4j1.mod b/jetty-home/src/main/resources/modules/logging-log4j1.mod index 70b8a1e607a..27842b86552 100644 --- a/jetty-home/src/main/resources/modules/logging-log4j1.mod +++ b/jetty-home/src/main/resources/modules/logging-log4j1.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Configures Jetty logging to use Log4j. diff --git a/jetty-home/src/main/resources/modules/logging-log4j2.mod b/jetty-home/src/main/resources/modules/logging-log4j2.mod index 42e93e4eca5..1c27fc33e8d 100644 --- a/jetty-home/src/main/resources/modules/logging-log4j2.mod +++ b/jetty-home/src/main/resources/modules/logging-log4j2.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Configures Jetty logging to use log4j version 2. diff --git a/jetty-home/src/main/resources/modules/logging-logback.mod b/jetty-home/src/main/resources/modules/logging-logback.mod index aa70e7f9a2e..00ba5f78276 100644 --- a/jetty-home/src/main/resources/modules/logging-logback.mod +++ b/jetty-home/src/main/resources/modules/logging-logback.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Configures Jetty logging to use Logback Logging. diff --git a/jetty-home/src/main/resources/modules/logging-noop.mod b/jetty-home/src/main/resources/modules/logging-noop.mod index ef1c7ff6f2c..58a5311d71d 100644 --- a/jetty-home/src/main/resources/modules/logging-noop.mod +++ b/jetty-home/src/main/resources/modules/logging-noop.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Configures Jetty logging to use SLF4J No-Op Implementation. diff --git a/jetty-home/src/main/resources/modules/logging/slf4j.mod b/jetty-home/src/main/resources/modules/logging/slf4j.mod index 059e02da365..a352cb5bdce 100644 --- a/jetty-home/src/main/resources/modules/logging/slf4j.mod +++ b/jetty-home/src/main/resources/modules/logging/slf4j.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Configures logging to use SLF4J. diff --git a/jetty-home/src/main/resources/modules/stop.mod b/jetty-home/src/main/resources/modules/stop.mod index 6b18509cd18..ad5d619ca12 100644 --- a/jetty-home/src/main/resources/modules/stop.mod +++ b/jetty-home/src/main/resources/modules/stop.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] This module causes Jetty to stop immediately after starting. diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml index 291b56b5ad9..b0db7b5d224 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod index e14b772ff0d..48c418a019f 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables GCloud Datastore API and implementation. diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod index 4d2a7e18f5f..5ef39b30272 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Controls GCloud API classpath. diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod index a975e1083ce..7806dd0f4f2 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables GCloudDatastore session management. diff --git a/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml b/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml index a53b2c52ac5..f0c6035fc71 100644 --- a/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml +++ b/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml b/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml index 8a931ec2611..ea09e1a172c 100644 --- a/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml +++ b/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod b/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod index 00e4a7eb56d..61d14871219 100644 --- a/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod +++ b/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables session data store in an embedded Hazelcast Map. diff --git a/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod b/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod index a1e2cfe547c..4a2d51a3fd7 100644 --- a/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod +++ b/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables session data store in a remote Hazelcast Map. diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml index d60a140879b..24645d4f8be 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml index 839575f394d..54a4832be2f 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml index c84714a4867..79a88aa3b08 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml index 89a4a2af503..c539859bb78 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml index aa0fb75f01f..26dcceabc7c 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml index 97785fb05ff..7cf7737769c 100644 --- a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml +++ b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod index b503e6c46e9..7c8c5855ec7 100644 --- a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod +++ b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Memcache cache for SessionData. diff --git a/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml b/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml index 3dde37177e4..645d9a1c3ab 100644 --- a/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml +++ b/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml b/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml index 1c0664c497a..daac2febb08 100644 --- a/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml +++ b/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod b/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod index cc896ed6280..ea6e8f7b1d9 100644 --- a/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod +++ b/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Enables NoSql session management with a MongoDB driver. diff --git a/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod b/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod index 3467a0f55cb..9c23370aa31 100644 --- a/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod +++ b/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] Server/port connections for Mongo session storage. diff --git a/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod b/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod index 2e8732c8401..ed87f8de706 100644 --- a/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod +++ b/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ +# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/ [description] MongoURI connections for Mongo session storage diff --git a/pom.xml b/pom.xml index 75d2827b19a..0cce8d9092a 100644 --- a/pom.xml +++ b/pom.xml @@ -220,7 +220,7 @@ 6.2 true /tmp - https://eclipse.dev/jetty/ + https://jetty.org/ 1.4 ${project.build.directory}/${jettyHomeZipFileName} jetty-home.zip diff --git a/tests/test-cross-context-dispatch/ccd-tests/src/test/resources/install-ccd-handler.xml b/tests/test-cross-context-dispatch/ccd-tests/src/test/resources/install-ccd-handler.xml index 7eefabf9bfc..ea7c1d39e4e 100644 --- a/tests/test-cross-context-dispatch/ccd-tests/src/test/resources/install-ccd-handler.xml +++ b/tests/test-cross-context-dispatch/ccd-tests/src/test/resources/install-ccd-handler.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index a27529f92c3..d1fa59a0afb 100644 --- a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -602,7 +602,7 @@ public class DistributionTests extends AbstractJettyHomeTest assertTrue(run2.awaitConsoleLogsFor("Started oejs.Server@", START_TIMEOUT, TimeUnit.SECONDS)); startHttpClient(() -> new HttpClient(new HttpClientTransportOverHTTP(1))); - ContentResponse response = client.GET("http://localhost:" + port + "/proxy/current/"); + ContentResponse response = client.GET("http://localhost:" + port + "/proxy/jetty-12/index.html"); assertEquals(HttpStatus.OK_200, response.getStatus(), () -> { StringBuilder rawResponse = new StringBuilder(); From 0644aaf88ceec22d4ccd6fd34ac9aac38b51c0c2 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 21 Aug 2024 11:44:20 +0300 Subject: [PATCH 9/9] Fixes #12154 - Limit concurrent virtual threads. (#12155) Updated VirtualThreadPool to limit the number of concurrent virtual threads using a Semaphore. Updated modules and documentation. Signed-off-by: Simone Bordet --- .../docs/programming/ArchitectureDocs.java | 18 +++- .../pages/modules/standard.adoc | 28 ++++++ .../operations-guide/pages/server/index.adoc | 32 +++---- .../programming-guide/pages/arch/threads.adoc | 19 +++- .../etc/jetty-threadpool-all-virtual.xml | 3 + .../config/etc/jetty-threadpool-virtual.xml | 27 ++---- .../config/modules/threadpool-all-virtual.mod | 11 ++- .../config/modules/threadpool-virtual.mod | 8 +- .../jetty/util/thread/VirtualThreadPool.java | 91 +++++++++++++++---- .../util/thread/VirtualThreadPoolTest.java | 43 +++++++++ 10 files changed, 223 insertions(+), 57 deletions(-) diff --git a/documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java b/documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java index 721372f5c24..5edfd89fbf5 100644 --- a/documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java +++ b/documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java @@ -17,17 +17,29 @@ import java.util.concurrent.Executors; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.thread.QueuedThreadPool; +import org.eclipse.jetty.util.thread.VirtualThreadPool; @SuppressWarnings("unused") public class ArchitectureDocs { - public void configureVirtualThreads() + public void queuedVirtualThreads() { - // tag::virtual[] + // tag::queuedVirtual[] QueuedThreadPool threadPool = new QueuedThreadPool(); threadPool.setVirtualThreadsExecutor(Executors.newVirtualThreadPerTaskExecutor()); Server server = new Server(threadPool); - // end::virtual[] + // end::queuedVirtual[] + } + + public void virtualVirtualThreads() + { + // tag::virtualVirtual[] + VirtualThreadPool threadPool = new VirtualThreadPool(); + // Limit the max number of current virtual threads. + threadPool.setMaxThreads(200); + + Server server = new Server(threadPool); + // end::virtualVirtual[] } } diff --git a/documentation/jetty/modules/operations-guide/pages/modules/standard.adoc b/documentation/jetty/modules/operations-guide/pages/modules/standard.adoc index 41b475fd1e4..d3992234c71 100644 --- a/documentation/jetty/modules/operations-guide/pages/modules/standard.adoc +++ b/documentation/jetty/modules/operations-guide/pages/modules/standard.adoc @@ -708,6 +708,34 @@ If you want to use virtual threads, introduced as a preview feature in Java 19 a See also the xref:server/index.adoc#threadpool[section about configuring the thread pool]. +[[threadpool-all-virtual]] +== Module `threadpool-all-virtual` + +The `threadpool-all-virtual` module allows you to configure the server-wide thread pool, similarly to what you can do with the <> Jetty module, so that all threads are virtual threads, introduced as an official feature since Java 21. + +CAUTION: Only use this module if you are using Java 21 or later. +If you are using Java 19 or Java 20, use the <> Jetty module instead. + +The module properties to configure the thread pool are: + +---- +include::{jetty-home}/modules/threadpool-all-virtual.mod[tags=documentation] +---- + +The property `jetty.threadpool.maxThreads` limits, using a `Semaphore`, the number of current virtual threads in use. + +Limiting the number of current virtual threads helps to limit resource usage in applications, especially in case of load spikes. +When an unlimited number of virtual threads is allowed, the server might be brought down due to resource (typically memory) exhaustion. + +[CAUTION] +==== +Even when using virtual threads, Jetty uses non-blocking I/O, and dedicates a thread to each `java.nio.channels.Selector` to perform the `Selector.select()` operation. + +Currently (up to Java 22), calling `Selector.select()` from a virtual thread pins the carrier thread. + +When using the `threadpool-all-virtual` Jetty module, if you have `N` selectors, then `N` carrier threads will be pinned by the virtual threads calling `Selector.select()`, possibly making your system less efficient, and at worst locking up the entire system if there are no carrier threads available to run virtual threads. +==== + [[threadpool-virtual]] == Module `threadpool-virtual` diff --git a/documentation/jetty/modules/operations-guide/pages/server/index.adoc b/documentation/jetty/modules/operations-guide/pages/server/index.adoc index f147d11d401..00c66b05489 100644 --- a/documentation/jetty/modules/operations-guide/pages/server/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/server/index.adoc @@ -328,32 +328,30 @@ Virtual threads have been introduced as a preview feature in Java 19 and Java 20 The xref:modules/standard.adoc#threadpool-virtual-preview[`threadpool-virtual-preview`] Jetty module provides support for virtual threads in Java 19 and Java 20, and it is mutually exclusive with the `threadpool` Jetty module. -The xref:modules/standard.adoc#threadpool-virtual[`threadpool-virtual`] Jetty module provides support for virtual threads in Java 21 or later, and it is mutually exclusive with the `threadpool` Jetty module. +When using Java 21, there are two Jetty modules available: + +* xref:modules/standard.adoc#threadpool-virtual[`threadpool-virtual`] +* xref:modules/standard.adoc#threadpool-all-virtual[`threadpool-all-virtual`] + +Both are mutually exclusive with the `threadpool` Jetty module. If you have already enabled the `threadpool` Jetty module, it is sufficient to remove it by removing the `$JETTY_BASE/start.d/threadpool.ini` file. -When using Java 21 or later, you can enable the xref:modules/standard.adoc#threadpool-virtual[`threadpool-virtual`] module: +The xref:modules/standard.adoc#threadpool-virtual[`threadpool-virtual`] Jetty module provides a mixed thread mode, where platform threads are used to run internal Jetty tasks, but application code is invoked using virtual threads. + +The xref:modules/standard.adoc#threadpool-all-virtual[`threadpool-all-virtual`] Jetty module provides a thread mode where all threads are virtual threads, including those used internally by Jetty. + +You can enable either module using: ---- $ java -jar $JETTY_HOME/start.jar --add-modules=threadpool-virtual,http ---- -After the command above, the `$JETTY_BASE` directory looks like this: +or -[source] ---- -$JETTY_BASE -├── resources -│ └── jetty-logging.properties -└── start.d - ├── http.ini - └── threadpool-virtual.ini +$ java -jar $JETTY_HOME/start.jar --add-modules=threadpool-all-virtual,http ---- -Now you can customize the `threadpool-virtual.ini` file to explicitly configure the thread pool and the virtual threads and then start Jetty: - -[jetty%nowrap] -.... -[jetty] -setupArgs=--add-modules=threadpool-virtual,http -.... +After the command above, the `$JETTY_BASE/start.d/` directory will contain the corresponding `threadpool-virtual.ini` or `threadpool-all-virtual.ini` file. +You can now explicitly configure the thread pool module properties inside the `+*.ini+` file and then start Jetty. diff --git a/documentation/jetty/modules/programming-guide/pages/arch/threads.adoc b/documentation/jetty/modules/programming-guide/pages/arch/threads.adoc index e8b7016643e..1fb7dff1d2b 100644 --- a/documentation/jetty/modules/programming-guide/pages/arch/threads.adoc +++ b/documentation/jetty/modules/programming-guide/pages/arch/threads.adoc @@ -235,11 +235,14 @@ Virtual threads have been introduced in Java 19 and Java 20 as a preview feature NOTE: In Java versions where virtual threads are a preview feature, remember to add `+--enable-preview+` to the JVM command line options to use virtual threads. +[[thread-pool-virtual-threads-queued]] +==== Virtual Threads Support with `QueuedThreadPool` + `QueuedThreadPool` can be configured to use virtual threads by specifying the virtual threads `Executor`: [,java,indent=0] ---- -include::code:example$src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java[tags=virtual] +include::code:example$src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java[tags=queuedVirtual] ---- [CAUTION] @@ -255,3 +258,17 @@ Enabling virtual threads in `QueuedThreadPool` will default the number of reserv Defaulting the number of reserved threads to zero ensures that the <> is always used, which means that virtual threads will always be used for blocking tasks. ==== + +[[thread-pool-virtual-threads-virtual]] +==== Virtual Threads Support with `VirtualThreadPool` + +`VirtualThreadPool` is an alternative to `QueuedThreadPool` that creates only virtual threads (no platform threads). + +[,java,indent=0] +---- +include::code:example$src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java[tags=virtualVirtual] +---- + +Despite the name, `VirtualThreadPool` does not pool virtual threads, but allows you to impose a limit on the maximum number of current virtual threads, in order to limit resource consumption. + +Furthermore, you can configure it to track virtual threads so that a xref:troubleshooting/component-dump.adoc[Jetty component dump] will show all virtual threads, including those that are unmounted. diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-all-virtual.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-all-virtual.xml index 2719a4011a3..6333073b0c2 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-all-virtual.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-all-virtual.xml @@ -3,7 +3,10 @@ + + + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml index 2995dfa0084..150c03a1cb3 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml @@ -11,25 +11,18 @@ - - - - - -virtual- - - - 0 - - - - - - - - - + + + + -virtual- + + + + + + diff --git a/jetty-core/jetty-server/src/main/config/modules/threadpool-all-virtual.mod b/jetty-core/jetty-server/src/main/config/modules/threadpool-all-virtual.mod index 1f9526b4f30..388871b6b3e 100644 --- a/jetty-core/jetty-server/src/main/config/modules/threadpool-all-virtual.mod +++ b/jetty-core/jetty-server/src/main/config/modules/threadpool-all-virtual.mod @@ -13,7 +13,16 @@ etc/jetty-threadpool-all-virtual.xml [ini-template] # tag::documentation[] -## Platform threads name prefix. +## Virtual threads name prefix. #jetty.threadPool.namePrefix=vtp +## Maximum number of current virtual threads. +#jetty.threadPool.maxThreads=200 + +## Whether to track virtual threads so they appear +## in the dump even if they are unmounted. +#jetty.threadPool.tracking=false + +## Whether to output virtual thread's stack traces in the dump. +#jetty.threadPool.detailedDump=false # end::documentation[] diff --git a/jetty-core/jetty-server/src/main/config/modules/threadpool-virtual.mod b/jetty-core/jetty-server/src/main/config/modules/threadpool-virtual.mod index 88ab2a0c274..ebc55200a6e 100644 --- a/jetty-core/jetty-server/src/main/config/modules/threadpool-virtual.mod +++ b/jetty-core/jetty-server/src/main/config/modules/threadpool-virtual.mod @@ -37,6 +37,10 @@ etc/jetty-threadpool-virtual.xml ## Virtual threads name prefix. #jetty.threadPool.virtual.namePrefix=qtp-virtual- -## Whether virtual threads inherits the values of inheritable thread locals. -#jetty.threadPool.virtual.inheritInheritableThreadLocals=true +## Max number of current virtual threads. +#jetty.threadPool.virtual.maxThreads=200 + +## Whether to track virtual threads so they appear +## in the dump even if they are unmounted. +#jetty.threadPool.virtual.tracking=false # end::documentation[] diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java index bd90805b98d..09e4d2577c6 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java @@ -16,6 +16,7 @@ package org.eclipse.jetty.util.thread; import java.util.Objects; import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.Semaphore; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.VirtualThreads; @@ -27,7 +28,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * An implementation of {@link ThreadPool} interface that does not pool, but instead uses {@link VirtualThreads}. + *

An implementation of {@link ThreadPool} interface that does not pool, but instead uses {@link VirtualThreads}.

+ *

It is possible to specify the max number of concurrent virtual threads that can be spawned, to help limiting + * resource usage in applications, especially in case of load spikes, where an unlimited number of virtual threads + * may be spawned, compete for resources, and eventually bring the system down due to memory exhaustion.

*/ @ManagedObject("A thread non-pool for virtual threads") public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool, Dumpable, TryExecutor, VirtualThreads.Configurable @@ -35,12 +39,14 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool, private static final Logger LOG = LoggerFactory.getLogger(VirtualThreadPool.class); private final AutoLock.WithCondition _joinLock = new AutoLock.WithCondition(); - private String _name = null; - private Executor _virtualExecutor; - private Thread _main; - private boolean _externalExecutor; + private String _name; + private int _maxThreads = 200; private boolean _tracking; private boolean _detailedDump; + private Thread _keepAlive; + private Executor _virtualExecutor; + private boolean _externalExecutor; + private Semaphore _semaphore; public VirtualThreadPool() { @@ -71,12 +77,32 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool, _name = name; } + /** + * @return the maximum number of concurrent virtual threads + */ + @ManagedAttribute("The max number of concurrent virtual threads") + public int getMaxThreads() + { + return _maxThreads; + } + + /** + * @param maxThreads the maximum number of concurrent virtual threads + */ + public void setMaxThreads(int maxThreads) + { + if (isRunning()) + throw new IllegalStateException(getState()); + _maxThreads = maxThreads; + } + /** * Get if this pool is tracking virtual threads. + * * @return {@code true} if the virtual threads will be tracked. * @see TrackingExecutor */ - @ManagedAttribute("virtual threads are tracked") + @ManagedAttribute("Whether virtual threads are tracked") public boolean isTracking() { return _tracking; @@ -89,7 +115,7 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool, _tracking = tracking; } - @ManagedAttribute("reports additional details in the dump") + @ManagedAttribute("Whether to report additional details in the dump") public boolean isDetailedDump() { return _detailedDump; @@ -101,11 +127,11 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool, if (_virtualExecutor instanceof TrackingExecutor trackingExecutor) trackingExecutor.setDetailedDump(detailedDump); } - + @Override protected void doStart() throws Exception { - _main = new Thread("jetty-virtual-thread-pool-keepalive") + _keepAlive = new Thread("jetty-virtual-thread-pool-keepalive") { @Override public void run() @@ -123,18 +149,24 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool, } } }; - _main.start(); + _keepAlive.start(); if (_virtualExecutor == null) { - _externalExecutor = false; _virtualExecutor = Objects.requireNonNull(StringUtil.isBlank(_name) ? VirtualThreads.getDefaultVirtualThreadsExecutor() : VirtualThreads.getNamedVirtualThreadsExecutor(_name)); } if (_tracking && !(_virtualExecutor instanceof TrackingExecutor)) - _virtualExecutor = new TrackingExecutor(_virtualExecutor, _detailedDump); + _virtualExecutor = new TrackingExecutor(_virtualExecutor, isDetailedDump()); addBean(_virtualExecutor); + + if (_maxThreads > 0) + { + _semaphore = new Semaphore(_maxThreads); + addBean(_semaphore); + } + super.doStart(); } @@ -142,11 +174,12 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool, protected void doStop() throws Exception { super.doStop(); + removeBean(_semaphore); + _semaphore = null; removeBean(_virtualExecutor); if (!_externalExecutor) _virtualExecutor = null; - _main = null; - + _keepAlive = null; try (AutoLock.WithCondition l = _joinLock.lock()) { l.signalAll(); @@ -208,7 +241,7 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool, { try { - _virtualExecutor.execute(task); + execute(task); return true; } catch (RejectedExecutionException e) @@ -221,6 +254,32 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool, @Override public void execute(Runnable task) { - _virtualExecutor.execute(task); + Runnable job = task; + if (_semaphore != null) + { + job = () -> + { + try + { + // The caller of execute(Runnable) cannot be blocked, + // as it is unknown whether it is a virtual thread. + // But this is a virtual thread, so acquiring a permit here + // blocks the virtual thread, but does not pin the carrier. + _semaphore.acquire(); + task.run(); + } + catch (InterruptedException x) + { + // Likely stopping this component, exit. + if (LOG.isDebugEnabled()) + LOG.debug("interrupted while waiting for permit {}", task, x); + } + finally + { + _semaphore.release(); + } + }; + } + _virtualExecutor.execute(job); } } diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/thread/VirtualThreadPoolTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/thread/VirtualThreadPoolTest.java index 1f9ef396a77..80683b7a8dc 100644 --- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/thread/VirtualThreadPoolTest.java +++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/thread/VirtualThreadPoolTest.java @@ -16,16 +16,19 @@ package org.eclipse.jetty.util.thread; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import org.eclipse.jetty.util.StringUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledForJreRange; import org.junit.jupiter.api.condition.JRE; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledForJreRange(max = JRE.JAVA_20) @@ -146,6 +149,46 @@ public class VirtualThreadPoolTest } } + @Test + public void testMaxThreads() throws Exception + { + VirtualThreadPool vtp = new VirtualThreadPool(); + vtp.setMaxThreads(1); + vtp.start(); + + AtomicBoolean run1 = new AtomicBoolean(); + CountDownLatch latch1 = new CountDownLatch(1); + vtp.execute(() -> + { + try + { + // Simulate a blocking call. + run1.set(true); + latch1.await(); + } + catch (InterruptedException x) + { + throw new RuntimeException(x); + } + }); + + // Wait for the first task to acquire the only permit. + await().atMost(1, TimeUnit.SECONDS).until(run1::get); + + // Try to submit another task, it should not + // be executed, and the caller must not block. + CountDownLatch latch2 = new CountDownLatch(1); + vtp.execute(latch2::countDown); + assertFalse(latch2.await(1, TimeUnit.SECONDS)); + + // Unblocking the first task allows the execution of the second task. + latch1.countDown(); + + assertTrue(latch2.await(5, TimeUnit.SECONDS)); + + vtp.stop(); + } + public static int count(String str, String subStr) { if (StringUtil.isEmpty(str))