juick-xmpp: using data services

2 files changed, 5 insertions, 8 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 5a19270b..31ffae9e 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
@@ -5,12 +5,12 @@ package com.juick.components.configuration;
  */
 
 import com.juick.components.XMPPServer;
+import com.juick.configuration.DataConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
-import org.springframework.jdbc.core.JdbcTemplate;
 
 import javax.inject.Inject;
 import java.util.concurrent.ExecutorService;
@@ -18,16 +18,14 @@ import java.util.concurrent.Executors;
 
 @Configuration
 @PropertySource("classpath:juick.conf")
+@Import(DataConfiguration.class)
 public class XmppAppConfiguration {
     @Inject
     private Environment env;
-    @Inject
-    private JdbcTemplate jdbcTemplate;
 
     @Bean
-    @DependsOn("jdbcTemplate")
     public XMPPServer xmpp() {
-        return new XMPPServer(env, service(), jdbcTemplate);
+        return new XMPPServer(env, service());
     }
 
     @Bean
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 89dd69e1..ee2ddceb 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,5 @@
 package com.juick.components.configuration;
 
-import com.juick.configuration.DataConfiguration;
 import org.springframework.web.filter.CharacterEncodingFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
@@ -13,7 +12,7 @@ public class XmppInitializer extends AbstractAnnotationConfigDispatcherServletIn
 
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class<?>[]{XmppAppConfiguration.class, DataConfiguration.class};
+        return new Class<?>[]{XmppAppConfiguration.class};
     }
 
     @Override