From c99b9350be030bfbf87829956a182753a81d07a2 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 29 Jun 2017 17:09:49 +0300
Subject: MVC was not enabled in apps based on BaseWebConfiguration

---
 .../juick/components/configuration/BotAppConfiguration.java    | 10 +++++-----
 .../com/juick/components/configuration/BotInitializer.java     |  5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

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

diff --git a/juick-xmpp-bot/src/main/java/com/juick/components/configuration/BotAppConfiguration.java b/juick-xmpp-bot/src/main/java/com/juick/components/configuration/BotAppConfiguration.java
index 09b366b6..b1b70155 100644
--- a/juick-xmpp-bot/src/main/java/com/juick/components/configuration/BotAppConfiguration.java
+++ b/juick-xmpp-bot/src/main/java/com/juick/components/configuration/BotAppConfiguration.java
@@ -1,12 +1,11 @@
 package com.juick.components.configuration;
 
 import com.juick.components.XMPPBot;
+import com.juick.server.configuration.BaseWebConfiguration;
 import com.juick.server.protocol.JuickProtocol;
-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.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
 import javax.inject.Inject;
 
@@ -16,7 +15,8 @@ import javax.inject.Inject;
 @Configuration
 @ComponentScan(basePackages = {"com.juick.components.controllers"})
 @PropertySource("classpath:juick.conf")
-public class BotAppConfiguration {
+@Import(BaseWebConfiguration.class)
+public class BotAppConfiguration extends WebMvcConfigurationSupport {
     @Inject
     private Environment env;
 
diff --git a/juick-xmpp-bot/src/main/java/com/juick/components/configuration/BotInitializer.java b/juick-xmpp-bot/src/main/java/com/juick/components/configuration/BotInitializer.java
index 9e8745af..ce4afd0c 100644
--- a/juick-xmpp-bot/src/main/java/com/juick/components/configuration/BotInitializer.java
+++ b/juick-xmpp-bot/src/main/java/com/juick/components/configuration/BotInitializer.java
@@ -1,7 +1,6 @@
 package com.juick.components.configuration;
 
 import com.juick.configuration.DataConfiguration;
-import com.juick.server.configuration.BaseWebConfiguration;
 import org.apache.commons.codec.CharEncoding;
 import org.springframework.web.filter.CharacterEncodingFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
@@ -15,12 +14,12 @@ public class BotInitializer extends AbstractAnnotationConfigDispatcherServletIni
 
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class<?>[]{BotAppConfiguration.class, DataConfiguration.class};
+        return new Class<?>[]{ DataConfiguration.class };
     }
 
     @Override
     protected Class<?>[] getServletConfigClasses() {
-        return new Class<?>[]{ BaseWebConfiguration.class };
+        return new Class<?>[]{ BotAppConfiguration.class };
     }
 
     @Override
-- 
cgit v1.2.3