Refactor packages

org.springframework.websocket  -> org.springframework.web.socket
org.springframework.sockjs     -> org.springframework.web.socket.sockjs

Flatten .sockjs and .sockjs.server

spring-websocket/src/main/java/org/springframework/sockjs/package-info.java

@@ -1,21 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Common abstractions and Spring configuration support for the SockJS protocol.
- */
-package org.springframework.sockjs;
-

spring-websocket/src/main/java/org/springframework/web/socket/BinaryMessage.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.websocket;
+package org.springframework.web.socket;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.websocket;
+package org.springframework.web.socket;
 
 import org.eclipse.jetty.websocket.api.StatusCode;
 import org.springframework.util.Assert;

spring-websocket/src/main/java/org/springframework/web/socket/TextMessage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket;
+package org.springframework.web.socket;
 
 import java.io.Reader;
 import java.io.StringReader;

spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket;
+package org.springframework.web.socket;
 
 /**
  * A handler for WebSocket messages and lifecycle events.
@@ -23,7 +23,7 @@ package org.springframework.websocket;
  * it makes sense or alternatively let the exception bubble up in which case the exception
  * is logged and the session closed with {@link CloseStatus#SERVER_ERROR SERVER_ERROR(1011)} by default.
  * The exception handling strategy is provided by
- * {@link org.springframework.websocket.support.ExceptionWebSocketHandlerDecorator ExceptionWebSocketHandlerDecorator},
+ * {@link org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator ExceptionWebSocketHandlerDecorator},
  * which can be customized or replaced by decorating the {@link WebSocketHandler} with a
  * different decorator.
  *

spring-websocket/src/main/java/org/springframework/web/socket/WebSocketMessage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket;
+package org.springframework.web.socket;
 
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;

spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket;
+package org.springframework.web.socket;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

spring-websocket/src/main/java/org/springframework/web/socket/adapter/AbstractWebSocketSesssionAdapter.java

@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.adapter;
+package org.springframework.web.socket.adapter;
 
 import java.io.IOException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.util.Assert;
-import org.springframework.websocket.BinaryMessage;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.TextMessage;
-import org.springframework.websocket.WebSocketMessage;
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.BinaryMessage;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketMessage;
+import org.springframework.web.socket.WebSocketSession;
 
 
 /**

spring-websocket/src/main/java/org/springframework/web/socket/adapter/BinaryWebSocketHandlerAdapter.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.adapter;
+package org.springframework.web.socket.adapter;
 
 import java.io.IOException;
 
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.TextMessage;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketSession;
 
 
 /**

spring-websocket/src/main/java/org/springframework/web/socket/adapter/ConfigurableWebSocketSession.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.adapter;
+package org.springframework.web.socket.adapter;
 
 import java.net.URI;
 import java.security.Principal;
 
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.WebSocketSession;
 
 
 /**

spring-websocket/src/main/java/org/springframework/web/socket/adapter/JettyWebSocketListenerAdapter.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.adapter;
+package org.springframework.web.socket.adapter;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.WebSocketListener;
 import org.springframework.util.Assert;
-import org.springframework.websocket.BinaryMessage;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.TextMessage;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.support.ExceptionWebSocketHandlerDecorator;
+import org.springframework.web.socket.BinaryMessage;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator;
 
 /**
  * Adapts Spring's {@link WebSocketHandler} to Jetty's {@link WebSocketListener}.

spring-websocket/src/main/java/org/springframework/web/socket/adapter/JettyWebSocketSessionAdapter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.adapter;
+package org.springframework.web.socket.adapter;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -24,10 +24,10 @@ import java.security.Principal;
 import org.eclipse.jetty.websocket.api.Session;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
-import org.springframework.websocket.BinaryMessage;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.TextMessage;
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.BinaryMessage;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
 
 
 /**

spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardEndpointAdapter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.adapter;
+package org.springframework.web.socket.adapter;
 
 import java.nio.ByteBuffer;
 
@@ -26,11 +26,11 @@ import javax.websocket.MessageHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.util.Assert;
-import org.springframework.websocket.BinaryMessage;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.TextMessage;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.support.ExceptionWebSocketHandlerDecorator;
+import org.springframework.web.socket.BinaryMessage;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator;
 
 
 /**

spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardWebSocketSessionAdapter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.adapter;
+package org.springframework.web.socket.adapter;
 
 import java.io.IOException;
 import java.net.URI;
@@ -24,10 +24,10 @@ import javax.websocket.CloseReason;
 import javax.websocket.CloseReason.CloseCodes;
 
 import org.springframework.util.Assert;
-import org.springframework.websocket.BinaryMessage;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.TextMessage;
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.BinaryMessage;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
 
 /**
  * A standard Java implementation of {@link WebSocketSession} that delegates to

spring-websocket/src/main/java/org/springframework/web/socket/adapter/TextWebSocketHandlerAdapter.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.adapter;
+package org.springframework.web.socket.adapter;
 
 import java.io.IOException;
 
-import org.springframework.websocket.BinaryMessage;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.BinaryMessage;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketSession;
 
 
 /**

spring-websocket/src/main/java/org/springframework/web/socket/adapter/WebSocketHandlerAdapter.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.adapter;
+package org.springframework.web.socket.adapter;
 
-import org.springframework.websocket.BinaryMessage;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.TextMessage;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketMessage;
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.BinaryMessage;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketMessage;
+import org.springframework.web.socket.WebSocketSession;
 
 
 /**

spring-websocket/src/main/java/org/springframework/web/socket/adapter/package-info.java

@@ -17,7 +17,7 @@
 /**
  * Classes adapting Spring's WebSocket API classes to and from various WebSocket
  * implementations. Also contains convenient base classes for
- * {@link org.springframework.websocket.WebSocketHandler} implementations.
+ * {@link org.springframework.web.socket.WebSocketHandler} implementations.
  */
-package org.springframework.websocket.adapter;
+package org.springframework.web.socket.adapter;
 

spring-websocket/src/main/java/org/springframework/web/socket/client/ConnectionManagerSupport.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.client;
+package org.springframework.web.socket.client;
 
 import java.net.URI;
 

spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketClient.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.websocket.client;
+package org.springframework.web.socket.client;
 
 import java.net.URI;
 
 import org.springframework.http.HttpHeaders;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketSession;
 
 /**
  * Contract for programmatically starting a WebSocket handshake request. For most cases it

spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectFailureException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.client;
+package org.springframework.web.socket.client;
 
 import org.springframework.core.NestedRuntimeException;
 

spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.client;
+package org.springframework.web.socket.client;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,10 +22,10 @@ import java.util.List;
 import org.springframework.context.SmartLifecycle;
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.CollectionUtils;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketSession;
-import org.springframework.websocket.support.ExceptionWebSocketHandlerDecorator;
-import org.springframework.websocket.support.LoggingWebSocketHandlerDecorator;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator;
+import org.springframework.web.socket.support.LoggingWebSocketHandlerDecorator;
 
 /**
  * @author Rossen Stoyanchev

spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/AnnotatedEndpointConnectionManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.client.endpoint;
+package org.springframework.web.socket.client.endpoint;
 
 import javax.websocket.ContainerProvider;
 import javax.websocket.Session;
@@ -23,8 +23,8 @@ import javax.websocket.WebSocketContainer;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.websocket.client.ConnectionManagerSupport;
-import org.springframework.websocket.support.BeanCreatingHandlerProvider;
+import org.springframework.web.socket.client.ConnectionManagerSupport;
+import org.springframework.web.socket.support.BeanCreatingHandlerProvider;
 
 /**
  * @author Rossen Stoyanchev

spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/EndpointConnectionManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.client.endpoint;
+package org.springframework.web.socket.client.endpoint;
 
 import java.util.Arrays;
 import java.util.List;
@@ -33,8 +33,8 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.util.Assert;
-import org.springframework.websocket.client.ConnectionManagerSupport;
-import org.springframework.websocket.support.BeanCreatingHandlerProvider;
+import org.springframework.web.socket.client.ConnectionManagerSupport;
+import org.springframework.web.socket.support.BeanCreatingHandlerProvider;
 
 /**
  * @author Rossen Stoyanchev

spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.client.endpoint;
+package org.springframework.web.socket.client.endpoint;
 
 import java.net.URI;
 import java.util.Arrays;
@@ -33,14 +33,14 @@ import javax.websocket.WebSocketContainer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.http.HttpHeaders;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.adapter.StandardEndpointAdapter;
+import org.springframework.web.socket.adapter.StandardWebSocketSessionAdapter;
+import org.springframework.web.socket.client.WebSocketClient;
+import org.springframework.web.socket.client.WebSocketConnectFailureException;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketSession;
-import org.springframework.websocket.adapter.StandardEndpointAdapter;
-import org.springframework.websocket.adapter.StandardWebSocketSessionAdapter;
-import org.springframework.websocket.client.WebSocketClient;
-import org.springframework.websocket.client.WebSocketConnectFailureException;
 
 /**
  * A standard Java {@link WebSocketClient}.

spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/WebSocketContainerFactoryBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.client.endpoint;
+package org.springframework.web.socket.client.endpoint;
 
 import javax.websocket.ContainerProvider;
 import javax.websocket.WebSocketContainer;

spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/package-info.java

@@ -16,9 +16,9 @@
 
 /**
  * Client-side classes for use with standard Java WebSocket endpoints including
- * {@link org.springframework.websocket.client.endpoint.EndpointConnectionManager} and
- * {@link org.springframework.websocket.client.endpoint.AnnotatedEndpointConnectionManager}
+ * {@link org.springframework.web.socket.client.endpoint.EndpointConnectionManager} and
+ * {@link org.springframework.web.socket.client.endpoint.AnnotatedEndpointConnectionManager}
  * for connecting to server endpoints using type-based or annotated endpoints respectively.
  */
-package org.springframework.websocket.client.endpoint;
+package org.springframework.web.socket.client.endpoint;
 

spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.client.jetty;
+package org.springframework.web.socket.client.jetty;
 
 import java.net.URI;
 
@@ -22,14 +22,14 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.SmartLifecycle;
 import org.springframework.http.HttpHeaders;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.adapter.JettyWebSocketListenerAdapter;
+import org.springframework.web.socket.adapter.JettyWebSocketSessionAdapter;
+import org.springframework.web.socket.client.WebSocketClient;
+import org.springframework.web.socket.client.WebSocketConnectFailureException;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketSession;
-import org.springframework.websocket.adapter.JettyWebSocketListenerAdapter;
-import org.springframework.websocket.adapter.JettyWebSocketSessionAdapter;
-import org.springframework.websocket.client.WebSocketClient;
-import org.springframework.websocket.client.WebSocketConnectFailureException;
 
 
 /**

spring-websocket/src/main/java/org/springframework/web/socket/client/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Server-side abstractions for WebSocket applications.
  */
-package org.springframework.websocket.client;
+package org.springframework.web.socket.client;
 

spring-websocket/src/main/java/org/springframework/web/socket/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Common abstractions and Spring configuration support for WebSocket applications.
  */
-package org.springframework.websocket;
+package org.springframework.web.socket;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server;
+package org.springframework.web.socket.server;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -37,7 +37,7 @@ import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
 
 /**
  * TODO

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server;
+package org.springframework.web.socket.server;
 
 import org.springframework.core.NestedRuntimeException;
 

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

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server;
+package org.springframework.web.socket.server;
 
 import java.io.IOException;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
 
 /**
  * Contract for processing a WebSocket handshake request.

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

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server;
+package org.springframework.web.socket.server;
 
 import java.io.IOException;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
 
 /**
  * A strategy for performing container-specific steps to upgrade an HTTP request during a

spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/EndpointExporter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server.endpoint;
+package org.springframework.web.socket.server.endpoint;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/EndpointRegistration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server.endpoint;
+package org.springframework.web.socket.server.endpoint;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,7 +33,7 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.util.Assert;
-import org.springframework.websocket.support.BeanCreatingHandlerProvider;
+import org.springframework.web.socket.support.BeanCreatingHandlerProvider;
 
 
 /**

spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/ServletServerContainerFactoryBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server.endpoint;
+package org.springframework.web.socket.server.endpoint;
 
 import javax.servlet.ServletContext;
 import javax.websocket.WebSocketContainer;
@@ -22,10 +22,10 @@ import javax.websocket.server.ServerContainer;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.sockjs.server.SockJsService;
 import org.springframework.util.Assert;
 import org.springframework.web.context.ServletContextAware;
-import org.springframework.websocket.server.DefaultHandshakeHandler;
+import org.springframework.web.socket.server.DefaultHandshakeHandler;
+import org.springframework.web.socket.sockjs.SockJsService;
 
 /**
  * A FactoryBean for {@link javax.websocket.server.ServerContainer}. Since

spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/SpringConfigurator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server.endpoint;
+package org.springframework.web.socket.server.endpoint;
 
 import java.util.Map;
 

spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/package-info.java

@@ -16,13 +16,13 @@
 
 /**
  * Server classes for use with standard Java WebSocket endpoints including
- * {@link org.springframework.websocket.server.endpoint.EndpointRegistration} and
- * {@link org.springframework.websocket.server.endpoint.EndpointExporter} for
+ * {@link org.springframework.web.socket.server.endpoint.EndpointRegistration} and
+ * {@link org.springframework.web.socket.server.endpoint.EndpointExporter} for
  * registering type-based endpoints,
- * {@link org.springframework.websocket.server.endpoint.SpringConfigurator} for
+ * {@link org.springframework.web.socket.server.endpoint.SpringConfigurator} for
  * instantiating annotated endpoints through Spring, and
  * {@link org.springframework.websocket.server.support.EndpointHandshakeHandler}
  * for integrating endpoints into HTTP request processing.
  */
-package org.springframework.websocket.server.endpoint;
+package org.springframework.web.socket.server.endpoint;
 

spring-websocket/src/main/java/org/springframework/web/socket/server/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Server-side abstractions for WebSocket applications.
  */
-package org.springframework.websocket.server;
+package org.springframework.web.socket.server;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server.support;
+package org.springframework.web.socket.server.support;
 
 import java.io.IOException;
 
@@ -24,11 +24,11 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.adapter.StandardEndpointAdapter;
-import org.springframework.websocket.adapter.StandardWebSocketSessionAdapter;
-import org.springframework.websocket.server.HandshakeFailureException;
-import org.springframework.websocket.server.RequestUpgradeStrategy;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.adapter.StandardEndpointAdapter;
+import org.springframework.web.socket.adapter.StandardWebSocketSessionAdapter;
+import org.springframework.web.socket.server.HandshakeFailureException;
+import org.springframework.web.socket.server.RequestUpgradeStrategy;
 
 /**
  * A {@link RequestUpgradeStrategy} that supports WebSocket handlers of type

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server.support;
+package org.springframework.web.socket.server.support;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -48,8 +48,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.websocket.server.HandshakeFailureException;
-import org.springframework.websocket.server.endpoint.EndpointRegistration;
+import org.springframework.web.socket.server.HandshakeFailureException;
+import org.springframework.web.socket.server.endpoint.EndpointRegistration;
 
 /**
  * GlassFish support for upgrading an {@link HttpServletRequest} during a WebSocket

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server.support;
+package org.springframework.web.socket.server.support;
 
 import java.io.IOException;
 
@@ -32,11 +32,11 @@ import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.http.server.ServletServerHttpResponse;
 import org.springframework.util.Assert;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.adapter.JettyWebSocketListenerAdapter;
-import org.springframework.websocket.adapter.JettyWebSocketSessionAdapter;
-import org.springframework.websocket.server.HandshakeFailureException;
-import org.springframework.websocket.server.RequestUpgradeStrategy;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.adapter.JettyWebSocketListenerAdapter;
+import org.springframework.web.socket.adapter.JettyWebSocketSessionAdapter;
+import org.springframework.web.socket.server.HandshakeFailureException;
+import org.springframework.web.socket.server.RequestUpgradeStrategy;
 
 /**
  * {@link RequestUpgradeStrategy} for use with Jetty. Based on Jetty's internal

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

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server.support;
+package org.springframework.web.socket.server.support;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.websocket.adapter.ConfigurableWebSocketSession;
+import org.springframework.web.socket.adapter.ConfigurableWebSocketSession;
 
 
 /**

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server.support;
+package org.springframework.web.socket.server.support;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -32,8 +32,8 @@ import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
-import org.springframework.websocket.server.HandshakeFailureException;
-import org.springframework.websocket.server.endpoint.EndpointRegistration;
+import org.springframework.web.socket.server.HandshakeFailureException;
+import org.springframework.web.socket.server.endpoint.EndpointRegistration;
 
 /**
  * Tomcat support for upgrading an {@link HttpServletRequest} during a WebSocket handshake.

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.server.support;
+package org.springframework.web.socket.server.support;
 
 import java.io.IOException;
 
@@ -28,11 +28,11 @@ import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.http.server.ServletServerHttpResponse;
 import org.springframework.util.Assert;
 import org.springframework.web.HttpRequestHandler;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.server.DefaultHandshakeHandler;
-import org.springframework.websocket.server.HandshakeHandler;
-import org.springframework.websocket.support.ExceptionWebSocketHandlerDecorator;
-import org.springframework.websocket.support.LoggingWebSocketHandlerDecorator;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.server.DefaultHandshakeHandler;
+import org.springframework.web.socket.server.HandshakeHandler;
+import org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator;
+import org.springframework.web.socket.support.LoggingWebSocketHandlerDecorator;
 
 /**
  * An {@link HttpRequestHandler} that wraps the invocation of a {@link HandshakeHandler}.

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

@@ -18,5 +18,5 @@
  * Server-side support classes including container-specific strategies for upgrading a
  * request.
  */
-package org.springframework.websocket.server.support;
+package org.springframework.web.socket.server.support;
 

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/AbstractServerSockJsSession.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server;
+package org.springframework.web.socket.sockjs;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -22,12 +22,11 @@ import java.net.SocketException;
 import java.util.Date;
 import java.util.concurrent.ScheduledFuture;
 
-import org.springframework.sockjs.AbstractSockJsSession;
 import org.springframework.util.Assert;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.TextMessage;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketMessage;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketMessage;
 
 /**
  * Provides partial implementations of {@link SockJsSession} methods to send messages,

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/AbstractSockJsService.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.sockjs.server;
+package org.springframework.web.socket.sockjs;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -36,7 +36,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.DigestUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
 
 /**
  * Provides support for SockJS configuration options and serves the static SockJS URLs.

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/AbstractSockJsSession.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs;
+package org.springframework.web.socket.sockjs;
 
 import java.io.IOException;
 import java.net.URI;
@@ -23,10 +23,10 @@ import java.security.Principal;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.util.Assert;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.TextMessage;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.adapter.ConfigurableWebSocketSession;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.adapter.ConfigurableWebSocketSession;
 
 
 /**

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/ConfigurableTransportHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server;
+package org.springframework.web.socket.sockjs;
 
 /**
  * @author Rossen Stoyanchev

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server;
+package org.springframework.web.socket.sockjs;
 
 import org.springframework.scheduling.TaskScheduler;
 

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsFrame.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server;
+package org.springframework.web.socket.sockjs;
 
 import java.nio.charset.Charset;
 

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsRuntimeException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server;
+package org.springframework.web.socket.sockjs;
 
 import org.springframework.core.NestedRuntimeException;
 

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsService.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server;
+package org.springframework.web.socket.sockjs;
 
 import java.io.IOException;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
 
 /**
  * @author Rossen Stoyanchev

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsSessionFactory.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs;
+package org.springframework.web.socket.sockjs;
 
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
 
 /**
  * A factory for creating a SockJS session.

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/TransportErrorException.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server;
+package org.springframework.web.socket.sockjs;
 
 import org.springframework.core.NestedRuntimeException;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
 
 
 /**

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/TransportHandler.java

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server;
+package org.springframework.web.socket.sockjs;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.sockjs.AbstractSockJsSession;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
 
 /**
  * @author Rossen Stoyanchev

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/TransportType.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server;
+package org.springframework.web.socket.sockjs;
 
 import java.util.Arrays;
 import java.util.List;

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/package-info.java

@@ -15,7 +15,7 @@
  */
 
 /**
- * Server-side SockJS abstractions and base classes.
+ * Common abstractions for the SockJS protocol.
  */
-package org.springframework.sockjs.server;
+package org.springframework.web.socket.sockjs;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.support;
+package org.springframework.web.socket.sockjs.support;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -34,27 +34,27 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.scheduling.TaskScheduler;
-import org.springframework.sockjs.AbstractSockJsSession;
-import org.springframework.sockjs.SockJsSessionFactory;
-import org.springframework.sockjs.server.AbstractSockJsService;
-import org.springframework.sockjs.server.ConfigurableTransportHandler;
-import org.springframework.sockjs.server.SockJsService;
-import org.springframework.sockjs.server.TransportErrorException;
-import org.springframework.sockjs.server.TransportHandler;
-import org.springframework.sockjs.server.TransportType;
-import org.springframework.sockjs.server.transport.EventSourceTransportHandler;
-import org.springframework.sockjs.server.transport.HtmlFileTransportHandler;
-import org.springframework.sockjs.server.transport.JsonpPollingTransportHandler;
-import org.springframework.sockjs.server.transport.JsonpTransportHandler;
-import org.springframework.sockjs.server.transport.WebSocketTransportHandler;
-import org.springframework.sockjs.server.transport.XhrPollingTransportHandler;
-import org.springframework.sockjs.server.transport.XhrStreamingTransportHandler;
-import org.springframework.sockjs.server.transport.XhrTransportHandler;
 import org.springframework.util.CollectionUtils;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.server.DefaultHandshakeHandler;
-import org.springframework.websocket.server.HandshakeHandler;
-import org.springframework.websocket.server.support.ServerWebSocketSessionInitializer;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.server.DefaultHandshakeHandler;
+import org.springframework.web.socket.server.HandshakeHandler;
+import org.springframework.web.socket.server.support.ServerWebSocketSessionInitializer;
+import org.springframework.web.socket.sockjs.AbstractSockJsService;
+import org.springframework.web.socket.sockjs.AbstractSockJsSession;
+import org.springframework.web.socket.sockjs.ConfigurableTransportHandler;
+import org.springframework.web.socket.sockjs.SockJsService;
+import org.springframework.web.socket.sockjs.SockJsSessionFactory;
+import org.springframework.web.socket.sockjs.TransportErrorException;
+import org.springframework.web.socket.sockjs.TransportHandler;
+import org.springframework.web.socket.sockjs.TransportType;
+import org.springframework.web.socket.sockjs.transport.EventSourceTransportHandler;
+import org.springframework.web.socket.sockjs.transport.HtmlFileTransportHandler;
+import org.springframework.web.socket.sockjs.transport.JsonpPollingTransportHandler;
+import org.springframework.web.socket.sockjs.transport.JsonpTransportHandler;
+import org.springframework.web.socket.sockjs.transport.WebSocketTransportHandler;
+import org.springframework.web.socket.sockjs.transport.XhrPollingTransportHandler;
+import org.springframework.web.socket.sockjs.transport.XhrStreamingTransportHandler;
+import org.springframework.web.socket.sockjs.transport.XhrTransportHandler;
 
 
 /**

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/SockJsHttpRequestHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.support;
+package org.springframework.web.socket.sockjs.support;
 
 import java.io.IOException;
 
@@ -26,14 +26,14 @@ import org.springframework.http.server.AsyncServletServerHttpRequest;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.http.server.ServletServerHttpResponse;
-import org.springframework.sockjs.server.SockJsService;
 import org.springframework.util.Assert;
 import org.springframework.web.HttpRequestHandler;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.sockjs.SockJsService;
+import org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator;
+import org.springframework.web.socket.support.LoggingWebSocketHandlerDecorator;
 import org.springframework.web.util.NestedServletException;
 import org.springframework.web.util.UrlPathHelper;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.support.ExceptionWebSocketHandlerDecorator;
-import org.springframework.websocket.support.LoggingWebSocketHandlerDecorator;
 
 /**
  * @author Rossen Stoyanchev

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/package-info.java

@@ -16,9 +16,9 @@
 
 /**
  * Server-side SockJS classes including a
- * {@link org.springframework.sockjs.server.support.DefaultSockJsService} implementation
+ * {@link org.springframework.web.socket.sockjs.support.DefaultSockJsService} implementation
  * as well as a Spring MVC HandlerMapping mapping SockJS services to incoming requests.
  *
  */
-package org.springframework.sockjs.server.support;
+package org.springframework.web.socket.sockjs.support;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -26,12 +26,12 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.sockjs.AbstractSockJsSession;
-import org.springframework.sockjs.server.SockJsRuntimeException;
-import org.springframework.sockjs.server.TransportErrorException;
-import org.springframework.sockjs.server.TransportHandler;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.support.ExceptionWebSocketHandlerDecorator;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.sockjs.AbstractSockJsSession;
+import org.springframework.web.socket.sockjs.SockJsRuntimeException;
+import org.springframework.web.socket.sockjs.TransportErrorException;
+import org.springframework.web.socket.sockjs.TransportHandler;
+import org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator;
 
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.io.IOException;
 
@@ -23,14 +23,14 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.sockjs.AbstractSockJsSession;
-import org.springframework.sockjs.SockJsSessionFactory;
-import org.springframework.sockjs.server.ConfigurableTransportHandler;
-import org.springframework.sockjs.server.SockJsConfiguration;
-import org.springframework.sockjs.server.SockJsFrame;
-import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
-import org.springframework.sockjs.server.TransportErrorException;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.sockjs.AbstractSockJsSession;
+import org.springframework.web.socket.sockjs.ConfigurableTransportHandler;
+import org.springframework.web.socket.sockjs.SockJsConfiguration;
+import org.springframework.web.socket.sockjs.SockJsFrame;
+import org.springframework.web.socket.sockjs.SockJsSessionFactory;
+import org.springframework.web.socket.sockjs.TransportErrorException;
+import org.springframework.web.socket.sockjs.SockJsFrame.FrameFormat;
 
 /**
  * TODO

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.io.IOException;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -23,15 +23,15 @@ import java.util.concurrent.BlockingQueue;
 import org.springframework.http.server.AsyncServerHttpRequest;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.sockjs.server.AbstractServerSockJsSession;
-import org.springframework.sockjs.server.SockJsConfiguration;
-import org.springframework.sockjs.server.SockJsFrame;
-import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
-import org.springframework.sockjs.server.TransportErrorException;
 import org.springframework.util.Assert;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.support.ExceptionWebSocketHandlerDecorator;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.sockjs.AbstractServerSockJsSession;
+import org.springframework.web.socket.sockjs.SockJsConfiguration;
+import org.springframework.web.socket.sockjs.SockJsFrame;
+import org.springframework.web.socket.sockjs.TransportErrorException;
+import org.springframework.web.socket.sockjs.SockJsFrame.FrameFormat;
+import org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator;
 
 /**
  * An abstract base class for use with HTTP-based transports.

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

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
 
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.sockjs.server.SockJsFrame.DefaultFrameFormat;
-import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
-import org.springframework.sockjs.server.TransportType;
 import org.springframework.util.Assert;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.sockjs.TransportType;
+import org.springframework.web.socket.sockjs.SockJsFrame.DefaultFrameFormat;
+import org.springframework.web.socket.sockjs.SockJsFrame.FrameFormat;
 
 /**
  * TODO

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -23,14 +23,14 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.sockjs.server.SockJsFrame.DefaultFrameFormat;
-import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
-import org.springframework.sockjs.server.TransportErrorException;
-import org.springframework.sockjs.server.TransportType;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.sockjs.TransportErrorException;
+import org.springframework.web.socket.sockjs.TransportType;
+import org.springframework.web.socket.sockjs.SockJsFrame.DefaultFrameFormat;
+import org.springframework.web.socket.sockjs.SockJsFrame.FrameFormat;
 import org.springframework.web.util.JavaScriptUtils;
-import org.springframework.websocket.WebSocketHandler;
 
 /**
  * TODO

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.nio.charset.Charset;
 
@@ -22,14 +22,14 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.sockjs.server.SockJsFrame;
-import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
-import org.springframework.sockjs.server.TransportErrorException;
-import org.springframework.sockjs.server.TransportType;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.sockjs.SockJsFrame;
+import org.springframework.web.socket.sockjs.TransportErrorException;
+import org.springframework.web.socket.sockjs.TransportType;
+import org.springframework.web.socket.sockjs.SockJsFrame.FrameFormat;
 import org.springframework.web.util.JavaScriptUtils;
-import org.springframework.websocket.WebSocketHandler;
 
 /**
  * TODO

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.io.IOException;
 
@@ -22,9 +22,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.sockjs.AbstractSockJsSession;
-import org.springframework.sockjs.server.TransportErrorException;
-import org.springframework.sockjs.server.TransportType;
+import org.springframework.web.socket.sockjs.AbstractSockJsSession;
+import org.springframework.web.socket.sockjs.TransportErrorException;
+import org.springframework.web.socket.sockjs.TransportType;
 
 public class JsonpTransportHandler extends AbstractHttpReceivingTransportHandler {
 

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

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.io.IOException;
 
-import org.springframework.sockjs.server.SockJsConfiguration;
-import org.springframework.sockjs.server.SockJsFrame;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.sockjs.SockJsConfiguration;
+import org.springframework.web.socket.sockjs.SockJsFrame;
 
 
 public class PollingServerSockJsSession extends AbstractHttpServerSockJsSession {

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

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.springframework.sockjs.server.SockJsConfiguration;
 import org.springframework.util.Assert;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.TextMessage;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketSession;
-import org.springframework.websocket.adapter.TextWebSocketHandlerAdapter;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.adapter.TextWebSocketHandlerAdapter;
+import org.springframework.web.socket.sockjs.SockJsConfiguration;
 
 
 /**

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

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.io.IOException;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.sockjs.server.SockJsConfiguration;
-import org.springframework.sockjs.server.SockJsFrame;
-import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
-import org.springframework.sockjs.server.TransportErrorException;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.sockjs.SockJsConfiguration;
+import org.springframework.web.socket.sockjs.SockJsFrame;
+import org.springframework.web.socket.sockjs.TransportErrorException;
+import org.springframework.web.socket.sockjs.SockJsFrame.FrameFormat;
 
 public class StreamingServerSockJsSession extends AbstractHttpServerSockJsSession {
 

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

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.io.IOException;
 
-import org.springframework.sockjs.server.AbstractServerSockJsSession;
-import org.springframework.sockjs.server.SockJsConfiguration;
-import org.springframework.sockjs.server.SockJsFrame;
 import org.springframework.util.StringUtils;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.TextMessage;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.sockjs.AbstractServerSockJsSession;
+import org.springframework.web.socket.sockjs.SockJsConfiguration;
+import org.springframework.web.socket.sockjs.SockJsFrame;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 

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

@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.io.IOException;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.sockjs.AbstractSockJsSession;
-import org.springframework.sockjs.SockJsSessionFactory;
-import org.springframework.sockjs.server.ConfigurableTransportHandler;
-import org.springframework.sockjs.server.SockJsConfiguration;
-import org.springframework.sockjs.server.TransportErrorException;
-import org.springframework.sockjs.server.TransportHandler;
-import org.springframework.sockjs.server.TransportType;
 import org.springframework.util.Assert;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.server.HandshakeHandler;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.server.HandshakeHandler;
+import org.springframework.web.socket.sockjs.AbstractSockJsSession;
+import org.springframework.web.socket.sockjs.ConfigurableTransportHandler;
+import org.springframework.web.socket.sockjs.SockJsConfiguration;
+import org.springframework.web.socket.sockjs.SockJsSessionFactory;
+import org.springframework.web.socket.sockjs.TransportErrorException;
+import org.springframework.web.socket.sockjs.TransportHandler;
+import org.springframework.web.socket.sockjs.TransportType;
 
 
 /**

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

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.nio.charset.Charset;
 
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.sockjs.server.SockJsFrame.DefaultFrameFormat;
-import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
-import org.springframework.sockjs.server.TransportType;
 import org.springframework.util.Assert;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.sockjs.TransportType;
+import org.springframework.web.socket.sockjs.SockJsFrame.DefaultFrameFormat;
+import org.springframework.web.socket.sockjs.SockJsFrame.FrameFormat;
 
 
 /**

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

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
 
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.sockjs.server.SockJsFrame.DefaultFrameFormat;
-import org.springframework.sockjs.server.SockJsFrame.FrameFormat;
-import org.springframework.sockjs.server.TransportType;
 import org.springframework.util.Assert;
-import org.springframework.websocket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.sockjs.TransportType;
+import org.springframework.web.socket.sockjs.SockJsFrame.DefaultFrameFormat;
+import org.springframework.web.socket.sockjs.SockJsFrame.FrameFormat;
 
 
 /**

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

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 
 import java.io.IOException;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.sockjs.server.TransportType;
+import org.springframework.web.socket.sockjs.TransportType;
 
 public class XhrTransportHandler extends AbstractHttpReceivingTransportHandler {
 

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/package-info.java

@@ -16,11 +16,11 @@
 
 /**
  * Server-side support for SockJS transports including
- * {@link org.springframework.sockjs.server.TransportHandler} implementations
+ * {@link org.springframework.web.socket.sockjs.TransportHandler} implementations
  * for processing incoming requests and their
  * {@link org.springframework.sockjs.SockJsSession} counterparts for
  * sending messages over the various transports.
  *
  */
-package org.springframework.sockjs.server.transport;
+package org.springframework.web.socket.sockjs.transport;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.support;
+package org.springframework.web.socket.support;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

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

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.support;
+package org.springframework.web.socket.support;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketMessage;
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketMessage;
+import org.springframework.web.socket.WebSocketSession;
 
 
 /**

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

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.support;
+package org.springframework.web.socket.support;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketMessage;
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketMessage;
+import org.springframework.web.socket.WebSocketSession;
 
 
 /**

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.support;
+package org.springframework.web.socket.support;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -25,10 +25,10 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.util.Assert;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketMessage;
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketMessage;
+import org.springframework.web.socket.WebSocketSession;
 
 /**
  * A {@link WebSocketHandler} that initializes and destroys a {@link WebSocketHandler}

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

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.websocket.support;
+package org.springframework.web.socket.support;
 
 import org.springframework.util.Assert;
-import org.springframework.websocket.CloseStatus;
-import org.springframework.websocket.WebSocketHandler;
-import org.springframework.websocket.WebSocketMessage;
-import org.springframework.websocket.WebSocketSession;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketMessage;
+import org.springframework.web.socket.WebSocketSession;
 
 
 /**

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

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.sockjs.server.support;
+package org.springframework.web.socket.sockjs.support;
 
 import java.util.Map;
 
 import org.junit.Test;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-import org.springframework.sockjs.server.TransportHandler;
-import org.springframework.sockjs.server.TransportType;
+import org.springframework.web.socket.sockjs.TransportHandler;
+import org.springframework.web.socket.sockjs.TransportType;
+import org.springframework.web.socket.sockjs.support.DefaultSockJsService;
 
 import static org.junit.Assert.*;