root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Switch spring-websocket/messaging to Tomcat 8 RC3

This commit is contained in:
Rossen Stoyanchev 2013-09-23 13:14:44 -04:00
parent 17d59c5621
commit a5c7018e8d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -368,13 +368,14 @@ project("spring-messaging") {
testCompile("org.eclipse.jetty:jetty-webapp:9.0.5.v20130815") { testCompile("org.eclipse.jetty:jetty-webapp:9.0.5.v20130815") {
exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet" 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-core:8.0.0-RC3")
testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0-SNAPSHOT") testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.0-RC3")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
} }
repositories { repositories {
maven { url "https://repository.apache.org/content/repositories/snapshots" } // tomcat-websocket-* snapshots 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 maven { url 'http://repo.springsource.org/libs-milestone' } // reactor
} }
} }
@ -547,7 +548,7 @@ project("spring-websocket") {
optional(project(":spring-webmvc")) optional(project(":spring-webmvc"))
optional("javax.servlet:javax.servlet-api:3.1.0") optional("javax.servlet:javax.servlet-api:3.1.0")
optional("javax.websocket:javax.websocket-api: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-websocket-api"
exclude group: "org.apache.tomcat", module: "tomcat-servlet-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("org.eclipse.jetty.websocket:websocket-client:9.0.5.v20130815")
optional("com.fasterxml.jackson.core:jackson-databind:2.2.0") optional("com.fasterxml.jackson.core:jackson-databind:2.2.0")
optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12") 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("org.slf4j:slf4j-jcl:${slf4jVersion}")
testCompile("log4j:log4j:1.2.17") testCompile("log4j:log4j:1.2.17")
} }
repositories { repositories {
maven { url "https://repository.apache.org/content/repositories/snapshots" } // tomcat-websocket-* snapshots 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 maven { url "https://maven.java.net/content/repositories/releases" } // javax.websocket, tyrus
} }
} }

4
spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
View File

@ -24,7 +24,7 @@ import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.Tomcat;
import org.apache.coyote.http11.Http11NioProtocol; import org.apache.coyote.http11.Http11NioProtocol;
import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.descriptor.web.ApplicationListener;
import org.apache.tomcat.websocket.server.WsListener; import org.apache.tomcat.websocket.server.WsContextListener;
import org.springframework.util.SocketUtils; import org.springframework.util.SocketUtils;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.DispatcherServlet;
@ -38,7 +38,7 @@ import org.springframework.web.servlet.DispatcherServlet;
public class TomcatWebSocketTestServer implements WebSocketTestServer { public class TomcatWebSocketTestServer implements WebSocketTestServer {
private static final ApplicationListener WS_APPLICATION_LISTENER = private static final ApplicationListener WS_APPLICATION_LISTENER =
new ApplicationListener(WsListener.class.getName(), false); new ApplicationListener(WsContextListener.class.getName(), false);
private final Tomcat tomcatServer; private final Tomcat tomcatServer;