2 files changed, 7 insertions, 6 deletions
diff --git a/juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java b/juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java
index 956b5bce..a0cf94a2 100644
--- a/juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java
+++ b/juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java
@@ -8,11 +8,12 @@ import com.juick.components.XMPPConnection;
 import com.juick.components.XMPPServer;
 import com.juick.components.s2s.CleaningUp;
 import com.juick.components.s2s.JuickBot;
-import com.juick.configuration.DataConfiguration;
+import com.juick.server.configuration.BaseWebConfiguration;
 import org.apache.commons.lang3.BooleanUtils;
 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 javax.inject.Inject;
 import java.util.concurrent.ExecutorService;
@@ -21,9 +22,9 @@ import java.util.concurrent.Executors;
 @Configuration
 @ComponentScan(basePackages = {"com.juick.components.controllers"})
 @PropertySource("classpath:juick.conf")
-@Import(DataConfiguration.class)
+@Import(BaseWebConfiguration.class)
 @EnableScheduling
-public class XmppAppConfiguration {
+public class XmppAppConfiguration extends WebMvcConfigurationSupport {
     @Inject
     private Environment env;
 
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 b7c096db..c3c98f41 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,6 +1,6 @@
 package com.juick.components.configuration;
 
-import com.juick.server.configuration.BaseWebConfiguration;
+import com.juick.configuration.DataConfiguration;
 import org.apache.commons.codec.CharEncoding;
 import org.springframework.web.filter.CharacterEncodingFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
@@ -14,12 +14,12 @@ public class XmppInitializer extends AbstractAnnotationConfigDispatcherServletIn
 
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class<?>[]{XmppAppConfiguration.class};
+        return new Class<?>[]{DataConfiguration.class};
     }
 
     @Override
     protected Class<?>[] getServletConfigClasses() {
-        return new Class<?>[]{ BaseWebConfiguration.class};
+        return new Class<?>[]{ XmppAppConfiguration.class};
     }
 
     @Override