Skip to content

Commit 83ef014

Browse files
committed
Merge branch '4.0.x'
Closes gh-50218
2 parents ad1795b + 3283c92 commit 83ef014

7 files changed

Lines changed: 100 additions & 7 deletions

File tree

documentation/spring-boot-docs/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ dependencies {
121121
implementation(project(path: ":module:spring-boot-jackson"))
122122
implementation(project(path: ":module:spring-boot-jdbc"))
123123
implementation(project(path: ":module:spring-boot-jdbc-test"))
124+
implementation(project(path: ":module:spring-boot-jetty"))
124125
implementation(project(path: ":module:spring-boot-jooq-test"))
125126
implementation(project(path: ":module:spring-boot-jpa"))
126127
implementation(project(path: ":module:spring-boot-jms"))

documentation/spring-boot-docs/src/docs/antora/modules/ROOT/pages/redirect.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,8 +679,8 @@
679679
* xref:how-to:webserver.adoc#howto.webserver.disable[#howto.webserver.disable]
680680
* xref:how-to:webserver.adoc#howto.webserver.discover-port[#howto-discover-the-http-port-at-runtime]
681681
* xref:how-to:webserver.adoc#howto.webserver.discover-port[#howto.webserver.discover-port]
682-
* xref:how-to:webserver.adoc#howto.webserver.enable-multiple-connectors-in-tomcat[#howto-enable-multiple-connectors-in-tomcat]
683-
* xref:how-to:webserver.adoc#howto.webserver.enable-multiple-connectors-in-tomcat[#howto.webserver.enable-multiple-connectors-in-tomcat]
682+
* xref:how-to:webserver.adoc#howto.webserver.enable-multiple-connectors.tomcat[#howto-enable-multiple-connectors-in-tomcat]
683+
* xref:how-to:webserver.adoc#howto.webserver.enable-multiple-connectors.tomcat[#howto.webserver.enable-multiple-connectors-in-tomcat]
684684
* xref:how-to:webserver.adoc#howto.webserver.enable-response-compression[#how-to-enable-http-response-compression]
685685
* xref:how-to:webserver.adoc#howto.webserver.enable-response-compression[#howto.webserver.enable-response-compression]
686686
* xref:how-to:webserver.adoc#howto.webserver.enable-tomcat-mbean-registry[#howto-enable-tomcat-mbean-registry]

documentation/spring-boot-docs/src/docs/antora/modules/how-to/pages/webserver.adoc

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,15 +548,29 @@ You can take complete control of the configuration of Tomcat's javadoc:org.apach
548548

549549

550550

551-
[[howto.webserver.enable-multiple-connectors-in-tomcat]]
552-
== Enable Multiple Connectors with Tomcat
551+
[[howto.webserver.enable-multiple-connectors]]
552+
== Enable Multiple Connectors
553+
554+
555+
556+
[[howto.webserver.enable-multiple-connectors.tomcat]]
557+
=== Multiple Connectors with Tomcat
553558

554559
You can add an javadoc:org.apache.catalina.connector.Connector[] to the javadoc:org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory[], which can allow multiple connectors, including HTTP and HTTPS connectors, as shown in the following example:
555560

556561
include-code::MyTomcatConfiguration[]
557562

558563

559564

565+
[[howto.webserver.enable-multiple-connectors.jetty]]
566+
=== Multiple Connectors with Jetty
567+
568+
You can register additional Jetty javadoc:org.eclipse.jetty.server.Connector[] instances by adding a javadoc:org.springframework.boot.jetty.JettyServerCustomizer[] on the javadoc:org.springframework.boot.jetty.ConfigurableJettyWebServerFactory[], as shown in the following example:
569+
570+
include-code::MyJettyConfiguration[]
571+
572+
573+
560574
[[howto.webserver.enable-tomcat-mbean-registry]]
561575
== Enable Tomcat's MBean Registry
562576

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* Copyright 2012-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.docs.howto.webserver.enablemultipleconnectors.jetty;
18+
19+
import org.eclipse.jetty.server.ServerConnector;
20+
21+
import org.springframework.boot.jetty.ConfigurableJettyWebServerFactory;
22+
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
23+
import org.springframework.context.annotation.Bean;
24+
import org.springframework.context.annotation.Configuration;
25+
26+
@Configuration(proxyBeanMethods = false)
27+
public class MyJettyConfiguration {
28+
29+
@Bean
30+
public WebServerFactoryCustomizer<ConfigurableJettyWebServerFactory> connectorCustomizer() {
31+
return (jetty) -> jetty.addServerCustomizers((server) -> {
32+
ServerConnector connector = new ServerConnector(server);
33+
connector.setPort(8081);
34+
server.addConnector(connector);
35+
});
36+
}
37+
38+
}

documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultipleconnectorsintomcat/MyTomcatConfiguration.java renamed to documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultipleconnectors/tomcat/MyTomcatConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.howto.webserver.enablemultipleconnectorsintomcat;
17+
package org.springframework.boot.docs.howto.webserver.enablemultipleconnectors.tomcat;
1818

1919
import org.apache.catalina.connector.Connector;
2020

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Copyright 2012-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.docs.howto.webserver.enablemultipleconnectors.jetty
18+
19+
import org.eclipse.jetty.server.Server
20+
import org.eclipse.jetty.server.ServerConnector
21+
import org.springframework.boot.jetty.ConfigurableJettyWebServerFactory
22+
import org.springframework.boot.jetty.JettyServerCustomizer
23+
import org.springframework.boot.web.server.WebServerFactoryCustomizer
24+
import org.springframework.context.annotation.Bean
25+
import org.springframework.context.annotation.Configuration
26+
27+
@Configuration(proxyBeanMethods = false)
28+
class MyJettyConfiguration {
29+
30+
@Bean
31+
fun connectorCustomizer(): WebServerFactoryCustomizer<ConfigurableJettyWebServerFactory> {
32+
return WebServerFactoryCustomizer { jetty: ConfigurableJettyWebServerFactory ->
33+
jetty.addServerCustomizers(JettyServerCustomizer { server: Server ->
34+
val connector = ServerConnector(server)
35+
connector.setPort(8081)
36+
server.addConnector(connector)
37+
})
38+
}
39+
}
40+
41+
}

documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/webserver/enablemultipleconnectorsintomcat/MyTomcatConfiguration.kt renamed to documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/webserver/enablemultipleconnectors/tomcat/MyTomcatConfiguration.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.howto.webserver.enablemultipleconnectorsintomcat
17+
package org.springframework.boot.docs.howto.webserver.enablemultipleconnectors.tomcat
1818

1919
import org.apache.catalina.connector.Connector
2020
import org.springframework.boot.web.server.WebServerFactoryCustomizer
@@ -39,4 +39,3 @@ class MyTomcatConfiguration {
3939
}
4040

4141
}
42-

0 commit comments

Comments
 (0)