Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
a5c7018e
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,体验更适合开发者的 AI 搜索 >>
提交
a5c7018e
编写于
9月 23, 2013
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Switch spring-websocket/messaging to Tomcat 8 RC3
上级
17d59c56
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
6 deletion
+8
-6
build.gradle
build.gradle
+6
-4
spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
...springframework/web/socket/TomcatWebSocketTestServer.java
+2
-2
未找到文件。
build.gradle
浏览文件 @
a5c7018e
...
...
@@ -368,13 +368,14 @@ project("spring-messaging") {
testCompile
(
"org.eclipse.jetty:jetty-webapp:9.0.5.v20130815"
)
{
exclude
group:
"org.eclipse.jetty.orbit"
,
module:
"javax.servlet"
}
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-core:8.0
-SNAPSHOT
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0
-SNAPSHOT
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-core:8.0
.0-RC3
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0
.0-RC3
"
)
testCompile
(
"org.slf4j:slf4j-jcl:${slf4jVersion}"
)
}
repositories
{
maven
{
url
"https://repository.apache.org/content/repositories/snapshots"
}
// tomcat-websocket-* snapshots
maven
{
url
"https://repository.apache.org/content/repositories/orgapachetomcat-080"
}
// tomcat 8 RC3
maven
{
url
'http://repo.springsource.org/libs-milestone'
}
// reactor
}
}
...
...
@@ -547,7 +548,7 @@ project("spring-websocket") {
optional
(
project
(
":spring-webmvc"
))
optional
(
"javax.servlet:javax.servlet-api:3.1.0"
)
optional
(
"javax.websocket:javax.websocket-api:1.0"
)
optional
(
"org.apache.tomcat:tomcat-websocket:8.0
-SNAPSHOT
"
)
{
optional
(
"org.apache.tomcat:tomcat-websocket:8.0
.0-RC3
"
)
{
exclude
group:
"org.apache.tomcat"
,
module:
"tomcat-websocket-api"
exclude
group:
"org.apache.tomcat"
,
module:
"tomcat-servlet-api"
}
...
...
@@ -560,13 +561,14 @@ project("spring-websocket") {
optional
(
"org.eclipse.jetty.websocket:websocket-client:9.0.5.v20130815"
)
optional
(
"com.fasterxml.jackson.core:jackson-databind:2.2.0"
)
optional
(
"org.codehaus.jackson:jackson-mapper-asl:1.9.12"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-core:8.0
-SNAPSHOT
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-core:8.0
.0-RC3
"
)
testCompile
(
"org.slf4j:slf4j-jcl:${slf4jVersion}"
)
testCompile
(
"log4j:log4j:1.2.17"
)
}
repositories
{
maven
{
url
"https://repository.apache.org/content/repositories/snapshots"
}
// tomcat-websocket-* snapshots
maven
{
url
"https://repository.apache.org/content/repositories/orgapachetomcat-080"
}
// tomcat 8 RC3
maven
{
url
"https://maven.java.net/content/repositories/releases"
}
// javax.websocket, tyrus
}
}
...
...
spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
浏览文件 @
a5c7018e
...
...
@@ -24,7 +24,7 @@ import org.apache.catalina.connector.Connector;
import
org.apache.catalina.startup.Tomcat
;
import
org.apache.coyote.http11.Http11NioProtocol
;
import
org.apache.tomcat.util.descriptor.web.ApplicationListener
;
import
org.apache.tomcat.websocket.server.WsListener
;
import
org.apache.tomcat.websocket.server.Ws
Context
Listener
;
import
org.springframework.util.SocketUtils
;
import
org.springframework.web.context.WebApplicationContext
;
import
org.springframework.web.servlet.DispatcherServlet
;
...
...
@@ -38,7 +38,7 @@ import org.springframework.web.servlet.DispatcherServlet;
public
class
TomcatWebSocketTestServer
implements
WebSocketTestServer
{
private
static
final
ApplicationListener
WS_APPLICATION_LISTENER
=
new
ApplicationListener
(
WsListener
.
class
.
getName
(),
false
);
new
ApplicationListener
(
Ws
Context
Listener
.
class
.
getName
(),
false
);
private
final
Tomcat
tomcatServer
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录