From cb2c2b2979663e4cdec50701d3bd0cfce240c7a6 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 30 Jun 2017 12:03:28 +0300
Subject: move babbler to server-core

---
 .../configuration/XMPPConfiguration.java           |  2 ++
 juick-server-core/build.gradle                     |  3 ++
 .../xmpp/core/session/debug/LogbackDebugger.java   | 39 ++++++++++++++++++++++
 juick-server-jdbc/build.gradle                     |  3 --
 .../xmpp/core/session/debug/LogbackDebugger.java   | 39 ----------------------
 5 files changed, 44 insertions(+), 42 deletions(-)
 create mode 100644 juick-server-core/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
 delete mode 100644 juick-server-jdbc/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java

diff --git a/juick-notifications/src/main/java/com/juick/components/configuration/XMPPConfiguration.java b/juick-notifications/src/main/java/com/juick/components/configuration/XMPPConfiguration.java
index 4cba533d..0073b502 100644
--- a/juick-notifications/src/main/java/com/juick/components/configuration/XMPPConfiguration.java
+++ b/juick-notifications/src/main/java/com/juick/components/configuration/XMPPConfiguration.java
@@ -5,6 +5,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import rocks.xmpp.core.session.Extension;
 import rocks.xmpp.core.session.XmppSessionConfiguration;
+import rocks.xmpp.core.session.debug.LogbackDebugger;
 import rocks.xmpp.extensions.component.accept.ExternalComponent;
 
 /**
@@ -25,6 +26,7 @@ public class XMPPConfiguration {
     public ExternalComponent xmpp() {
         XmppSessionConfiguration configuration = XmppSessionConfiguration.builder()
                 .extensions(Extension.of(com.juick.Message.class))
+                .debugger(LogbackDebugger.class)
                 .build();
         return ExternalComponent.create(pushJid, xmppPushPassword, configuration, xmppHost, xmppPort);
     }
diff --git a/juick-server-core/build.gradle b/juick-server-core/build.gradle
index 081bfd75..5dda25db 100644
--- a/juick-server-core/build.gradle
+++ b/juick-server-core/build.gradle
@@ -11,6 +11,9 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-annotations:${rootProject.jacksonVersion}"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}"
 
+    compile "rocks.xmpp:xmpp-core-client:0.7.4"
+    compile "rocks.xmpp:xmpp-extensions-client:0.7.4"
+
     compile "javax.inject:javax.inject:1"
 
     testCompile "junit:junit:${rootProject.junitVersion}"
diff --git a/juick-server-core/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java b/juick-server-core/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
new file mode 100644
index 00000000..3da660b2
--- /dev/null
+++ b/juick-server-core/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
@@ -0,0 +1,39 @@
+package rocks.xmpp.core.session.debug;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import rocks.xmpp.core.session.XmppSession;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Created by vitalyster on 17.11.2016.
+ */
+public class LogbackDebugger implements XmppDebugger {
+    private static final Logger logger = LoggerFactory.getLogger(LogbackDebugger.class);
+
+    @Override
+    public void initialize(XmppSession xmppSession) {
+    }
+
+    @Override
+    public void writeStanza(String s, Object o) {
+        logger.info("OUT: {}", s);
+    }
+
+    @Override
+    public void readStanza(String s, Object o) {
+        logger.info("IN: {}", s);
+    }
+
+    @Override
+    public OutputStream createOutputStream(OutputStream outputStream) {
+        return outputStream;
+    }
+
+    @Override
+    public InputStream createInputStream(InputStream inputStream) {
+        return inputStream;
+    }
+}
diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle
index 184a7bfe..96919cd2 100644
--- a/juick-server-jdbc/build.gradle
+++ b/juick-server-jdbc/build.gradle
@@ -39,9 +39,6 @@ dependencies {
     compile "com.googlecode.log4jdbc:log4jdbc:1.2"
     compile "javax.inject:javax.inject:1"
 
-    compile "rocks.xmpp:xmpp-core-client:0.7.4"
-    compile "rocks.xmpp:xmpp-extensions-client:0.7.4"
-
     compile 'org.imgscalr:imgscalr-lib:4.2'
 
     providedCompile "javax.servlet:javax.servlet-api:3.1.0"
diff --git a/juick-server-jdbc/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java b/juick-server-jdbc/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
deleted file mode 100644
index 3da660b2..00000000
--- a/juick-server-jdbc/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package rocks.xmpp.core.session.debug;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import rocks.xmpp.core.session.XmppSession;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Created by vitalyster on 17.11.2016.
- */
-public class LogbackDebugger implements XmppDebugger {
-    private static final Logger logger = LoggerFactory.getLogger(LogbackDebugger.class);
-
-    @Override
-    public void initialize(XmppSession xmppSession) {
-    }
-
-    @Override
-    public void writeStanza(String s, Object o) {
-        logger.info("OUT: {}", s);
-    }
-
-    @Override
-    public void readStanza(String s, Object o) {
-        logger.info("IN: {}", s);
-    }
-
-    @Override
-    public OutputStream createOutputStream(OutputStream outputStream) {
-        return outputStream;
-    }
-
-    @Override
-    public InputStream createInputStream(InputStream inputStream) {
-        return inputStream;
-    }
-}
-- 
cgit v1.2.3