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

Add Tomcat WebSocket integration tests

Browse Source
This commit is contained in:
Rossen Stoyanchev
2013-09-01 16:01:15 -04:00
parent e21bbdd933
commit fee3148b0f
12 changed files with 349 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build.gradle
View File

@@ -322,10 +322,14 @@ project("spring-messaging") {
optional("org.projectreactor:reactor-core:1.0.0.M2")
optional("org.projectreactor:reactor-tcp:1.0.0.M2")
optional("com.lmax:disruptor:3.1.1")
optional("org.eclipse.jetty.websocket:websocket-server:9.0.5.v20130815")
optional("org.eclipse.jetty.websocket:websocket-client:9.0.5.v20130815")
testCompile(project(":spring-test"))
testCompile("com.thoughtworks.xstream:xstream:1.4.4")
testCompile("commons-dbcp:commons-dbcp:1.2.2")
testCompile("javax.inject:javax.inject-tck:1")
testCompile("javax.servlet:javax.servlet-api:3.1.0")
testCompile("log4j:log4j:1.2.17")
testCompile("org.apache.activemq:activemq-broker:5.8.0")
testCompile("org.apache.activemq:activemq-kahadb-store:5.8.0") {
exclude group: "org.springframework", module: "spring-context"
@@ -334,16 +338,14 @@ project("spring-messaging") {
testCompile("org.eclipse.jetty:jetty-webapp:9.0.5.v20130815") {
exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
}
optional("org.eclipse.jetty.websocket:websocket-server:9.0.5.v20130815")
optional("org.eclipse.jetty.websocket:websocket-client:9.0.5.v20130815")
testCompile("javax.servlet:javax.servlet-api:3.0.1")
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.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 'http://repo.springsource.org/libs-milestone' } // reactor
maven { url 'http://repo.springsource.org/libs-snapshot' } // reactor
}
}
@@ -528,6 +530,7 @@ 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.slf4j:slf4j-jcl:${slf4jVersion}")
testCompile("log4j:log4j:1.2.17")
}