From 6604dc96558028c0095f33eca1852de5e61f8466 Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Fri, 11 Nov 2016 01:29:01 +0700
Subject: common data configuration is added

---
 .../com/juick/components/configuration/XMPPInitializer.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'juick-xmpp/src/main/java/com/juick/components/configuration/XMPPInitializer.java')

diff --git a/juick-xmpp/src/main/java/com/juick/components/configuration/XMPPInitializer.java b/juick-xmpp/src/main/java/com/juick/components/configuration/XMPPInitializer.java
index 604516c4..3942f889 100644
--- a/juick-xmpp/src/main/java/com/juick/components/configuration/XMPPInitializer.java
+++ b/juick-xmpp/src/main/java/com/juick/components/configuration/XMPPInitializer.java
@@ -1,4 +1,6 @@
 package com.juick.components.configuration;
+
+import com.juick.configuration.DataConfiguration;
 import org.springframework.web.filter.CharacterEncodingFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
@@ -10,24 +12,25 @@ import javax.servlet.Filter;
 public class XMPPInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class[] {XMPPConfiguration.class};
+        return new Class[]{DataConfiguration.class};
     }
 
     @Override
     protected Class<?>[] getServletConfigClasses() {
-        return null;
+        return new Class[]{XMPPConfiguration.class};
     }
 
     @Override
     protected String[] getServletMappings() {
-        return new String[] {
+        return new String[]{
                 "/"
         };
     }
+
     @Override
     protected Filter[] getServletFilters() {
         CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter();
         characterEncodingFilter.setEncoding("UTF-8");
-        return new Filter[] { characterEncodingFilter};
+        return new Filter[]{characterEncodingFilter};
     }
 }
-- 
cgit v1.2.3