Update deps for spring-websocket

Author: rstoyanchev

build.gradle

@@ -506,8 +506,8 @@ project("spring-websocket") {
 		compile(project(":spring-context"))
 		compile(project(":spring-web"))
 
-		optional("org.apache.tomcat:tomcat-servlet-api:8.0-SNAPSHOT") // TODO: replace with "javax.servlet:javax.servlet-api"
-		optional("org.apache.tomcat:tomcat-websocket-api:8.0-SNAPSHOT") // TODO: replace with "javax.websocket:javax.websocket-api"
+		optional("javax.servlet:javax.servlet-api:3.1-b09")
+		optional("javax.websocket:javax.websocket-api:1.0-rc5")
 
 		optional("org.apache.tomcat:tomcat-websocket:8.0-SNAPSHOT") {
 			exclude group: "org.apache.tomcat", module: "tomcat-websocket-api"
@@ -528,10 +528,9 @@ project("spring-websocket") {
 	}
 
 	repositories {
-		maven { url "http://repo.springsource.org/libs-release" }
 		maven { url "https://maven.java.net/content/groups/public/" } // javax.websocket-*
-		maven { url "https://repository.apache.org/content/repositories/snapshots" } // tomcat-websocket snapshots
-		maven { url "https://maven.java.net/content/repositories/snapshots" } // tyrus/glassfish snapshots
+		maven { url "https://repository.apache.org/content/repositories/snapshots" } // tomcat-websocket-* snapshots
+		maven { url "https://maven.java.net/content/repositories/snapshots" } // tyrus snapshots
 	}
 }
 

spring-websocket/src/main/java/org/springframework/web/socket/server/support/GlassFishRequestUpgradeStrategy.java

@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.Random;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
@@ -102,7 +103,13 @@ public void upgradeInternal(ServerHttpRequest request, ServerHttpResponse respon
 	private boolean performUpgrade(HttpServletRequest request, HttpServletResponse response,
 			HttpHeaders headers, TyrusEndpoint tyrusEndpoint) throws IOException {
 
-		final TyrusHttpUpgradeHandler upgradeHandler = request.upgrade(TyrusHttpUpgradeHandler.class);
+		final TyrusHttpUpgradeHandler upgradeHandler;
+		try {
+			upgradeHandler = request.upgrade(TyrusHttpUpgradeHandler.class);
+		}
+		catch (ServletException e) {
+			throw new HandshakeFailureException("Unable to create UpgardeHandler", e);
+		}
 
 		Connection connection = createConnection(upgradeHandler, response);
 

spring-websocket/src/main/java/org/springframework/web/socket/server/support/TomcatRequestUpgradeStrategy.java

@@ -20,6 +20,7 @@
 import java.lang.reflect.Method;
 import java.util.Collections;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.websocket.Endpoint;
 import javax.websocket.server.ServerEndpointConfig;
@@ -55,7 +56,13 @@ public void upgradeInternal(ServerHttpRequest request, ServerHttpResponse respon
 		Assert.isTrue(request instanceof ServletServerHttpRequest);
 		HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest();
 
-		WsHttpUpgradeHandler upgradeHandler = servletRequest.upgrade(WsHttpUpgradeHandler.class);
+		WsHttpUpgradeHandler upgradeHandler;
+		try {
+			upgradeHandler = servletRequest.upgrade(WsHttpUpgradeHandler.class);
+		}
+		catch (ServletException e) {
+			throw new HandshakeFailureException("Unable to create UpgardeHandler", e);
+		}
 
 		WsHandshakeRequest webSocketRequest = new WsHandshakeRequest(servletRequest);
 		try {

spring-websocket/src/test/java/org/springframework/web/socket/sockjs/StubTaskScheduler.java

@@ -20,9 +20,8 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.web.socket.AbstractHttpRequestTests;
-import org.springframework.web.socket.adapter.TextWebSocketHandlerAdapter;
-import org.springframework.web.socket.sockjs.StubTaskScheduler;
 import org.springframework.web.socket.sockjs.TransportHandler;
 import org.springframework.web.socket.sockjs.TransportType;
 
@@ -42,7 +41,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests {
 	@Before
 	public void setUp() {
 		super.setUp();
-		this.service = new DefaultSockJsService(new StubTaskScheduler());
+		this.service = new DefaultSockJsService(new ThreadPoolTaskScheduler());
 		this.service.setValidSockJsPrefixes("/echo");
 	}
 
@@ -62,21 +61,4 @@ public void defaultTransportHandlers() {
 		assertNotNull(handlers.get(TransportType.EVENT_SOURCE));
 	}
 
-	@Test
-	public void xhrSend() throws Exception {
-
-		setRequest("POST", "/echo/000/c5839f69/xhr");
-		this.service.handleRequest(this.request, this.response, new TextWebSocketHandlerAdapter());
-
-		resetResponse();
-		setRequest("POST", "/echo/000/c5839f69/xhr_send");
-		this.servletRequest.setContent("[\"x\"]".getBytes("UTF-8"));
-
-		this.service.handleRequest(this.request, this.response, new TextWebSocketHandlerAdapter());
-
-		assertEquals(204, this.servletResponse.getStatus());
-		assertEquals("text/plain;charset=UTF-8", this.servletResponse.getContentType());
-	}
-
-
 }