Update default SockJS CDN location

bclozel · bclozel · commit a6e1c53f233f · 2014-09-26T21:42:08.000+02:00
This commit updates the default location of the SockJS' client library. The previous location is being retired by the project maintainers. The new default location is backed by several CDN providers: * https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js See sockjs/sockjs-client#198 Issue: SPR-12254
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
@@ -83,7 +83,7 @@ public SockJsServiceRegistration setTaskScheduler(TaskScheduler taskScheduler) {
 	 * this property allows specifying where to load it from.
 	 *
 	 * <p>By default this is set to point to
-	 * "https://d1fxtkz8shb9d2.cloudfront.net/sockjs-0.3.4.min.js". However it can
+	 * "https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js". However it can
 	 * also be set to point to a URL served by the application.
 	 *
 	 * <p>Note that it's possible to specify a relative URL in which case the URL
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
@@ -68,7 +68,7 @@ public abstract class AbstractSockJsService implements SockJsService {
 
 	private String name = "SockJSService@" + ObjectUtils.getIdentityHexString(this);
 
-	private String clientLibraryUrl = "https://d1fxtkz8shb9d2.cloudfront.net/sockjs-0.3.4.min.js";
+	private String clientLibraryUrl = "https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js";
 
 	private int streamBytesLimit = 128 * 1024;
 
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java
@@ -148,15 +148,15 @@ public void handleIframeRequest() throws Exception {
 
 		assertEquals("text/html;charset=UTF-8", this.servletResponse.getContentType());
 		assertTrue(this.servletResponse.getContentAsString().startsWith("<!DOCTYPE html>\n"));
-		assertEquals(496, this.servletResponse.getContentLength());
+		assertEquals(490, this.servletResponse.getContentLength());
 		assertEquals("public, max-age=31536000", this.response.getHeaders().getCacheControl());
-		assertEquals("\"0da1ed070012f304e47b83c81c48ad620\"", this.response.getHeaders().getETag());
+		assertEquals("\"06b486b3208b085d9e3220f456a6caca4\"", this.response.getHeaders().getETag());
 	}
 
 	@Test
 	public void handleIframeRequestNotModified() throws Exception {
 
-		this.servletRequest.addHeader("If-None-Match", "\"0da1ed070012f304e47b83c81c48ad620\"");
+		this.servletRequest.addHeader("If-None-Match", "\"06b486b3208b085d9e3220f456a6caca4\"");
 
 		resetResponseAndHandleRequest("GET", "/echo/iframe.html", HttpStatus.NOT_MODIFIED);
 	}

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public SockJsServiceRegistration setTaskScheduler(TaskScheduler taskScheduler) {`
`83`	`83`	`* this property allows specifying where to load it from.`
`84`	`84`	`*`
`85`	`85`	`* <p>By default this is set to point to`
`86`		`- * "https://d1fxtkz8shb9d2.cloudfront.net/sockjs-0.3.4.min.js". However it can`
	`86`	`+ * "https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js". However it can`
`87`	`87`	`* also be set to point to a URL served by the application.`
`88`	`88`	`*`
`89`	`89`	`* <p>Note that it's possible to specify a relative URL in which case the URL`