aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-06-30 12:03:28 +0300
committerGravatar Vitaly Takmazov2017-06-30 12:03:28 +0300
commitcb2c2b2979663e4cdec50701d3bd0cfce240c7a6 (patch)
treeb49127a5047d3b4ff11bf908500d0871f5a4ed9c
parentea519116e9b5ff184498241298d8c9002a173c73 (diff)
move babbler to server-core
-rw-r--r--juick-notifications/src/main/java/com/juick/components/configuration/XMPPConfiguration.java2
-rw-r--r--juick-server-core/build.gradle3
-rw-r--r--juick-server-core/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java (renamed from juick-server-jdbc/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java)0
-rw-r--r--juick-server-jdbc/build.gradle3
4 files changed, 5 insertions, 3 deletions
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-jdbc/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java b/juick-server-core/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
index 3da660b2..3da660b2 100644
--- a/juick-server-jdbc/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
+++ b/juick-server-core/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
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"