diff options
| author |  Vitaly Takmazov | 2016-11-15 15:56:06 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2016-11-15 15:56:06 +0300 |
| commit | 2cfabeab2e64a1b8b6db32a0135a2fce06bc87ab (patch) | |
| tree | 65790951a6b43e436f8bfc742cc3a81cbeeb7b2c /server-core | |
| parent | 1c65b6d29c0fc69d861ffa0e624f73981b62cca6 (diff) | |
all components using babbler now, only juick-xmpp uses ugnich xmpp
Diffstat (limited to 'server-core')
| -rw-r--r-- | server-core/build.gradle | 2 | ||||
| -rw-r--r-- | server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/server-core/build.gradle b/server-core/build.gradle index f082e2c8..705b7675 100644 --- a/server-core/build.gradle +++ b/server-core/build.gradle @@ -14,8 +14,6 @@ def springFrameworkVersion = '4.3.4.RELEASE' dependencies { compile project(':juick-core') - compile project(':deps:com.juick.xmpp') - compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" diff --git a/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java b/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java index f1e98eb9..6fa3790e 100644 --- a/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java +++ b/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java @@ -8,7 +8,6 @@ import com.juick.json.MessageSerializer; import com.juick.server.*; import com.juick.server.protocol.annotation.UserCommand; import com.juick.util.TagUtils; -import com.juick.xmpp.extensions.JuickMessage; import org.springframework.jdbc.core.JdbcTemplate; import java.lang.reflect.InvocationTargetException; @@ -305,7 +304,7 @@ public class JuickProtocol { if (ret == 200) { - JuickMessage jmsg = new JuickMessage(); + Message jmsg = new Message(); jmsg.setUser(user_from); jmsg.setText(body); // TODO: add PM payload |