From 194a9a763c6b11d207e682b2f93de94475c473b4 Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Sat, 12 Nov 2016 01:34:07 +0700
Subject: extracted application configuration from Mvc configuration with
 application specific beans; extracted bean initialization from constructor;
 force using properties;

---
 .../java/com/juick/ws/configuration/WebsocketInitializer.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java')

diff --git a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
index 4829710f..d4e797ad 100644
--- a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
+++ b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
@@ -10,14 +10,15 @@ import javax.servlet.Filter;
  * Created by vt on 09/02/16.
  */
 public class WebsocketInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
+
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class[]{DataConfiguration.class};
+        return new Class<?>[]{WebsocketAppConfiguration.class, DataConfiguration.class};
     }
 
     @Override
     protected Class<?>[] getServletConfigClasses() {
-        return new Class[]{WebsocketConfiguration.class};
+        return new Class<?>[]{WebsocketMvcConfiguration.class};
     }
 
     @Override
@@ -31,4 +32,9 @@ public class WebsocketInitializer extends AbstractAnnotationConfigDispatcherServ
         characterEncodingFilter.setEncoding("UTF-8");
         return new Filter[]{characterEncodingFilter};
     }
+
+    @Override
+    protected String getServletName() {
+        return "Web socket dispather servlet";
+    }
 }
-- 
cgit v1.2.3