Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move server related classes from src/test to src/main

Browse Source
This commit is contained in:
Sebastien Deleuze
2015-10-07 14:06:26 +02:00
parent 464ff1d960
commit 07374f48d6
8 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-web-reactive/build.gradle
View File

@@ -44,17 +44,17 @@ dependencies {
optional "io.projectreactor:reactor-net:2.1.0.BUILD-SNAPSHOT"
optional 'org.apache.tomcat:tomcat-util:8.0.24'
optional 'org.apache.tomcat.embed:tomcat-embed-core:8.0.24'
optional 'org.eclipse.jetty:jetty-server:9.3.2.v20150730'
optional 'org.eclipse.jetty:jetty-servlet:9.3.2.v20150730'
provided "javax.servlet:javax.servlet-api:3.1.0"
testCompile "junit:junit:4.12"
testCompile "org.springframework:spring-test:4.2.0.RELEASE"
testCompile 'org.apache.tomcat:tomcat-util:8.0.24'
testCompile 'org.apache.tomcat.embed:tomcat-embed-core:8.0.24'
testCompile 'org.eclipse.jetty:jetty-server:9.3.2.v20150730'
testCompile 'org.eclipse.jetty:jetty-servlet:9.3.2.v20150730'
testCompile "org.slf4j:slf4j-jcl:1.7.12"
testCompile "org.slf4j:jul-to-slf4j:1.7.12"
testCompile("log4j:log4j:1.2.16")

0
spring-web-reactive/src/test/java/org/springframework/reactive/web/http/HttpServer.java → spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServer.java
View File

0
spring-web-reactive/src/test/java/org/springframework/reactive/web/http/HttpServerSupport.java → spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServerSupport.java
View File

4
spring-web-reactive/src/test/java/org/springframework/reactive/web/http/ReactorHttpServer.java → spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorHttpServer.java
View File

@@ -13,9 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.reactive.web.http;
package org.springframework.reactive.web.http.reactor;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.reactive.web.http.HttpServer;
import org.springframework.reactive.web.http.HttpServerSupport;
import org.springframework.reactive.web.http.reactor.RequestHandlerAdapter;
import org.springframework.util.Assert;
import reactor.bus.selector.Selectors;

4
spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RxNettyHttpServer.java → spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyHttpServer.java
View File

@@ -13,11 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.reactive.web.http;
package org.springframework.reactive.web.http.rxnetty;
import io.netty.buffer.ByteBuf;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.reactive.web.http.HttpServer;
import org.springframework.reactive.web.http.HttpServerSupport;
import org.springframework.reactive.web.http.rxnetty.RequestHandlerAdapter;
import org.springframework.util.Assert;

5
spring-web-reactive/src/test/java/org/springframework/reactive/web/http/JettyHttpServer.java → spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/JettyHttpServer.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.reactive.web.http;
package org.springframework.reactive.web.http.servlet;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
@@ -21,7 +21,8 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.reactive.web.http.servlet.HttpHandlerServlet;
import org.springframework.reactive.web.http.HttpServer;
import org.springframework.reactive.web.http.HttpServerSupport;
import org.springframework.util.Assert;
import org.springframework.util.SocketUtils;

5
spring-web-reactive/src/test/java/org/springframework/reactive/web/http/TomcatHttpServer.java → spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/TomcatHttpServer.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.reactive.web.http;
package org.springframework.reactive.web.http.servlet;
import java.io.File;
@@ -22,7 +22,8 @@ import org.apache.catalina.LifecycleException;
import org.apache.catalina.startup.Tomcat;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.reactive.web.http.servlet.HttpHandlerServlet;
import org.springframework.reactive.web.http.HttpServer;
import org.springframework.reactive.web.http.HttpServerSupport;
import org.springframework.util.Assert;
import org.springframework.util.SocketUtils;

4
spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTests.java
View File

@@ -21,6 +21,10 @@ import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.springframework.reactive.web.http.reactor.ReactorHttpServer;
import org.springframework.reactive.web.http.rxnetty.RxNettyHttpServer;
import org.springframework.reactive.web.http.servlet.JettyHttpServer;
import org.springframework.reactive.web.http.servlet.TomcatHttpServer;
import org.springframework.util.SocketUtils;