extracted application configuration from Mvc configuration with application specific beans;

extracted bean initialization from constructor;
force using properties;

1 files changed, 13 insertions, 6 deletions

diff --git a/juick-xmpp-ft/src/main/java/com/juick/components/configuration/FileTransferInitializer.java b/juick-xmpp-ft/src/main/java/com/juick/components/configuration/FileTransferInitializer.java
index db514e21..bf0e7257 100644
--- a/juick-xmpp-ft/src/main/java/com/juick/components/configuration/FileTransferInitializer.java
+++ b/juick-xmpp-ft/src/main/java/com/juick/components/configuration/FileTransferInitializer.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;
 
@@ -8,26 +10,31 @@ import javax.servlet.Filter;
  * Created by vt on 09/02/16.
  */
 public class FileTransferInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
+
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class[] {FileTransferConfiguration.class};
+        return new Class<?>[]{FileTransferAppConfiguration.class, DataConfiguration.class};
     }
 
     @Override
     protected Class<?>[] getServletConfigClasses() {
-        return null;
+        return new Class<?>[]{FileTransferMvcConfiguration.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};
+    }
+
+    @Override
+    protected String getServletName() {
+        return "File transfer dispantcher servlet";
     }
 }