diff --git a/spring-web-reactive/.gitignore b/spring-web-reactive/.gitignore index 207211d54c272286cd23e67d3b406e4e81851540..0b81cf52bef52f781016c8ac1af78c1f0ef8a13e 100644 --- a/spring-web-reactive/.gitignore +++ b/spring-web-reactive/.gitignore @@ -6,5 +6,5 @@ target /.idea/ bin .gradle -tomcat* +/tomcat.*/ build diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java index 4a2b94e2dbc2dabf9b4701f75363edac964b6dfb..1b705ed5f5d33331918a257ecb0aa1544bec8e20 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java @@ -23,12 +23,12 @@ import org.junit.Before; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.springframework.http.server.reactive.boot.HttpServer; -import org.springframework.http.server.reactive.boot.JettyHttpServer; -import org.springframework.http.server.reactive.boot.ReactorHttpServer; -import org.springframework.http.server.reactive.boot.RxNettyHttpServer; -import org.springframework.http.server.reactive.boot.TomcatHttpServer; -import org.springframework.http.server.reactive.boot.UndertowHttpServer; +import org.springframework.http.server.reactive.bootstrap.HttpServer; +import org.springframework.http.server.reactive.bootstrap.JettyHttpServer; +import org.springframework.http.server.reactive.bootstrap.ReactorHttpServer; +import org.springframework.http.server.reactive.bootstrap.RxNettyHttpServer; +import org.springframework.http.server.reactive.bootstrap.TomcatHttpServer; +import org.springframework.http.server.reactive.bootstrap.UndertowHttpServer; import org.springframework.util.SocketUtils; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java index c7dfa83f739bf40f09da934b28f48a7bd8f6da38..8f8b1d6320a5a5e9aea377ef6aec88cde63f1048 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java @@ -25,7 +25,7 @@ import reactor.core.publisher.Mono; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; -import org.springframework.http.server.reactive.boot.ReactorHttpServer; +import org.springframework.http.server.reactive.bootstrap.ReactorHttpServer; import org.springframework.web.client.ResponseErrorHandler; import org.springframework.web.client.RestTemplate; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java index 1b1e8c7aa0902513cce9e284752503a4562036c1..09d5a22160a90bc307446a0ba76c80b76c54074f 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java @@ -28,8 +28,8 @@ import org.springframework.http.MediaType; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.http.ZeroCopyHttpOutputMessage; -import org.springframework.http.server.reactive.boot.ReactorHttpServer; -import org.springframework.http.server.reactive.boot.UndertowHttpServer; +import org.springframework.http.server.reactive.bootstrap.ReactorHttpServer; +import org.springframework.http.server.reactive.bootstrap.UndertowHttpServer; import org.springframework.web.client.RestTemplate; import static org.junit.Assert.assertEquals; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/HttpServer.java similarity index 94% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/HttpServer.java index e706861852680e7688ecf90fc89c96454b358d5a..8bc8ae12d4e39bedc781339429d7e8883ed606d3 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/HttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import org.springframework.beans.factory.InitializingBean; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServerSupport.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/HttpServerSupport.java similarity index 95% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServerSupport.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/HttpServerSupport.java index c238f60e5586348dc4d946e182f260d0e0f70f32..4c22291b91edc4edd658f2d4d0425e101c0bc460 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServerSupport.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/HttpServerSupport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import org.springframework.http.server.reactive.HttpHandler; import org.springframework.util.SocketUtils; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/JettyHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/JettyHttpServer.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/JettyHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/JettyHttpServer.java index 51837739ce1e38642a591f722a1d4bec2ac0cefb..485af7594b6909ed0fb032b35dfc03652e01945a 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/JettyHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/JettyHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java index 8bb845a534b4a89e9536c21598e63efa8786974c..1bba2c3c858413386792270960865a8e9147f3cb 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import reactor.core.flow.Loopback; import reactor.core.state.Completable; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/RxNettyHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/RxNettyHttpServer.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/RxNettyHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/RxNettyHttpServer.java index 11171996845970d60595e50b00bf2b8757b4d25c..051ba64e66655a29c3b52934827428727233afa7 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/RxNettyHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/RxNettyHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import java.net.InetSocketAddress; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/TomcatHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/TomcatHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java index acbb4568d3436b2d7d0f1a2bd46afca6f0740764..1a47951590095aec735dc89b81dcf437b57b6bde 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/TomcatHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import java.io.File; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/UndertowHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/UndertowHttpServer.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/UndertowHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/UndertowHttpServer.java index 5c6048353c3ea298b8a98b79c8340bafadc44a6d..ca9555a816f411430108c694cb38ff9428233580 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/UndertowHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/UndertowHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import io.undertow.Undertow; import io.undertow.server.HttpHandler; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/package-info.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/package-info.java similarity index 73% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/package-info.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/package-info.java index 56e9fbd1877725fb0c39e5d3e27ba06ff87a3a9f..93e5dac54947119729c6818744d93f52871e60f4 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/package-info.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/package-info.java @@ -2,4 +2,4 @@ * This package contains temporary interfaces and classes for running embedded servers. * They are expected to be replaced by an upcoming Spring Boot support. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap;