diff options
Diffstat (limited to 'juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java')
-rw-r--r-- | juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java | 10 |
1 files changed, 4 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 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 |