From 2cfabeab2e64a1b8b6db32a0135a2fce06bc87ab Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 15 Nov 2016 15:56:06 +0300
Subject: all components using babbler now, only juick-xmpp uses ugnich xmpp

---
 server-core/build.gradle                                               | 2 --
 server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'server-core')

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
-- 
cgit v1.2.3