diff options
author | Vitaly Takmazov | 2017-02-07 12:49:22 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2017-02-07 12:49:22 +0300 |
commit | 428c748b25b156a973f508e82a1c53ab6b74bc2b (patch) | |
tree | 7316e60b944ec5a1727cf41872480bc23be26bf7 /juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java | |
parent | b8af9d2621a1cd94bfb24ee31e5a92d9f4e56c4e (diff) |
juick-xmpp: merge juick-xmpp-ft
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 | 7 |
1 files changed, 2 insertions, 5 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 22b4cc41..35de10f6 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 @@ -4,13 +4,12 @@ package com.juick.components.configuration; * Created by aalexeev on 11/12/16. */ +import com.juick.components.XMPPConnection; import com.juick.components.XMPPServer; import com.juick.components.s2s.CleaningUp; -import com.juick.components.XMPPConnection; import com.juick.components.s2s.JuickBot; import com.juick.configuration.DataConfiguration; import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.math.NumberUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -50,8 +49,6 @@ public class XmppAppConfiguration { @Bean public XMPPConnection router() { boolean disabled = BooleanUtils.toBoolean(env.getProperty("xmpp_disabled", "false")); - return disabled ? null : new XMPPConnection(xmpp(), env.getProperty("componentname"), - NumberUtils.toInt(env.getProperty("component_port"), 5347), - env.getProperty("xmpp_password")); + return disabled ? null : new XMPPConnection(); } } |