Fix failing tests and upgrade websocket to Jetty 9.0.5

build.gradle

@@ -331,6 +331,11 @@ project("spring-messaging") {
 			exclude group: "org.springframework", module: "spring-context"
 		}
 		testCompile("org.apache.activemq:activemq-stomp:5.8.0")
+		testCompile("org.eclipse.jetty:jetty-webapp:9.0.5.v20130815") {
+			exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
+		}
+		testCompile("org.eclipse.jetty.websocket:websocket-server:9.0.5.v20130815")
+		testCompile("javax.servlet:javax.servlet-api:3.0.1")
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 		testCompile("log4j:log4j:1.2.17")
 }
@@ -515,11 +520,11 @@ project("spring-websocket") {
 		}
 		optional("org.glassfish.tyrus:tyrus-websocket-core:1.2.1")
 		optional("org.glassfish.tyrus:tyrus-container-servlet:1.2.1")
-		optional("org.eclipse.jetty:jetty-webapp:9.0.4.v20130625") {
+		optional("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.4.v20130625")
-		optional("org.eclipse.jetty.websocket:websocket-client:9.0.4.v20130625")
+		optional("org.eclipse.jetty.websocket:websocket-server: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("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
 	}

spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java

@@ -59,6 +59,8 @@ public class SimpleBrokerMessageHandlerTests {
 	@Test
 	public void subcribePublish() {
 
+		this.messageHandler.start();
+
 		this.messageHandler.handleMessage(createSubscriptionMessage("sess1", "sub1", "/foo"));
 		this.messageHandler.handleMessage(createSubscriptionMessage("sess1", "sub2", "/foo"));
 		this.messageHandler.handleMessage(createSubscriptionMessage("sess1", "sub3", "/bar"));
@@ -85,6 +87,8 @@ public class SimpleBrokerMessageHandlerTests {
 		String sess1 = "sess1";
 		String sess2 = "sess2";
 
+		this.messageHandler.start();
+
 		this.messageHandler.handleMessage(createSubscriptionMessage(sess1, "sub1", "/foo"));
 		this.messageHandler.handleMessage(createSubscriptionMessage(sess1, "sub2", "/foo"));
 		this.messageHandler.handleMessage(createSubscriptionMessage(sess1, "sub3", "/bar"));

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java

@@ -157,7 +157,7 @@ public class DefaultSockJsService extends AbstractSockJsService {
 		}
 		catch (Exception ex) {
 			if (logger.isWarnEnabled()) {
-				logger.warn("Failed to add default WebSocketTransportHandler: " + ex.getMessage());
+				logger.warn("Failed to create default WebSocketTransportHandler", ex);
 			}
 		}
 		return result;