From b18ed6b724b93a6a8ad936b4ed8ffad78bbddb92 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 16 Jul 2014 20:40:06 -0400 Subject: [PATCH] Remove erroneously commited code --- .../config/annotation/EnableWebSocket.java | 2 +- .../WebSocketScopeConfiguration.java | 40 ------------------- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketScopeConfiguration.java diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/EnableWebSocket.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/EnableWebSocket.java index b381a93db6..15722bdf2e 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/EnableWebSocket.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/EnableWebSocket.java @@ -58,6 +58,6 @@ import org.springframework.context.annotation.Import; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @Documented -@Import({DelegatingWebSocketConfiguration.class, WebSocketScopeConfiguration.class}) +@Import(DelegatingWebSocketConfiguration.class) public @interface EnableWebSocket { } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketScopeConfiguration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketScopeConfiguration.java deleted file mode 100644 index f17ced513c..0000000000 --- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketScopeConfiguration.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2002-2014 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. - */ - -package org.springframework.web.socket.config.annotation; - -import java.util.Collections; - -import org.springframework.beans.factory.config.CustomScopeConfigurer; -import org.springframework.context.annotation.Bean; -import org.springframework.messaging.simp.SimpSessionScope; - -/** - * Bean configuration for a "websocket" scope, bound to {@link SimpSessionScope}. - * - * @author Rossen Stoyanchev - * @since 4.1 - */ -public class WebSocketScopeConfiguration { - - @Bean - public CustomScopeConfigurer webSocketScopeConfigurer() { - CustomScopeConfigurer configurer = new CustomScopeConfigurer(); - configurer.setScopes(Collections.singletonMap("websocket", new SimpSessionScope())); - return configurer; - } - -}