Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
07374f48
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
07374f48
编写于
10月 07, 2015
作者:
S
Sebastien Deleuze
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move server related classes from src/test to src/main
上级
464ff1d9
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
22 addition
and
12 deletion
+22
-12
spring-web-reactive/build.gradle
spring-web-reactive/build.gradle
+6
-6
spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServer.java
...ava/org/springframework/reactive/web/http/HttpServer.java
+0
-0
spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServerSupport.java
.../springframework/reactive/web/http/HttpServerSupport.java
+0
-0
spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorHttpServer.java
...ramework/reactive/web/http/reactor/ReactorHttpServer.java
+3
-1
spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyHttpServer.java
...ramework/reactive/web/http/rxnetty/RxNettyHttpServer.java
+3
-1
spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/JettyHttpServer.java
...gframework/reactive/web/http/servlet/JettyHttpServer.java
+3
-2
spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/TomcatHttpServer.java
...framework/reactive/web/http/servlet/TomcatHttpServer.java
+3
-2
spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTests.java
...eactive/web/http/AbstractHttpHandlerIntegrationTests.java
+4
-0
未找到文件。
spring-web-reactive/build.gradle
浏览文件 @
07374f48
...
...
@@ -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"
)
...
...
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
浏览文件 @
07374f48
文件已移动
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
浏览文件 @
07374f48
文件已移动
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
浏览文件 @
07374f48
...
...
@@ -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
;
...
...
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
浏览文件 @
07374f48
...
...
@@ -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
;
...
...
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
浏览文件 @
07374f48
...
...
@@ -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
;
...
...
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
浏览文件 @
07374f48
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTests.java
浏览文件 @
07374f48
...
...
@@ -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
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录