diff options
author | 2017-06-29 17:09:49 +0300 | |
---|---|---|
committer | 2017-06-30 10:22:20 +0300 | |
commit | c99b9350be030bfbf87829956a182753a81d07a2 (patch) | |
tree | 1485ea407aca135eee7815d93a3636ba793a0276 /juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java | |
parent | b75b5a3d1a3bf001923d49923dcebee95ba2327e (diff) |
MVC was not enabled in apps based on BaseWebConfiguration
Diffstat (limited to 'juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java')
-rw-r--r-- | juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java index b7e0e658..4edca8c6 100644 --- a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java +++ b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java @@ -1,14 +1,13 @@ package com.juick.ws.configuration; +import com.juick.server.configuration.BaseWebConfiguration; import com.juick.server.protocol.JuickProtocol; import com.juick.ws.WebsocketComponent; import com.juick.ws.XMPPConnection; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; +import org.springframework.context.annotation.*; import org.springframework.core.env.Environment; import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; import org.springframework.web.socket.config.annotation.EnableWebSocket; import org.springframework.web.socket.config.annotation.ServletWebSocketHandlerRegistry; import org.springframework.web.socket.config.annotation.WebSocketConfigurer; @@ -25,7 +24,8 @@ import javax.inject.Inject; @EnableScheduling @EnableWebSocket @PropertySource("classpath:juick.conf") -class WebsocketConfiguration implements WebSocketConfigurer { +@Import(BaseWebConfiguration.class) +class WebsocketConfiguration extends WebMvcConfigurationSupport implements WebSocketConfigurer { @Inject private Environment env; |