diff options
| author |  Vitaly Takmazov | 2018-02-17 22:13:12 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2018-02-17 22:13:12 +0300 |
| commit | dd8a51e0f342c183116d8b2af3f12394b0ac53dd (patch) | |
| tree | ea88db8f0c79256f9527d1220023f2ba5d24994d /juick-xmpp-wip | |
| parent | ae265f84efc37619411fb21d92b51183a4744478 (diff) | |
server: merge xmpp
Diffstat (limited to 'juick-xmpp-wip')
| -rw-r--r-- | juick-xmpp-wip/build.gradle | 2 | ||||
| -rw-r--r-- | juick-xmpp-wip/src/main/java/com/juick/components/XMPPRouter.java | 2 | ||||
| -rw-r--r-- | juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/juick-xmpp-wip/build.gradle b/juick-xmpp-wip/build.gradle index 75870140..65d84755 100644 --- a/juick-xmpp-wip/build.gradle +++ b/juick-xmpp-wip/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'org.akhikhl.gretty' dependencies { compile project(':juick-server-jdbc') compile project(':juick-server-web') - compile project(':juick-xmpp') + compile project(':juick-server') testCompile project(path: ':juick-core', configuration: 'testArtifacts') testCompile project(path: ':juick-server-web', configuration: 'testArtifacts') diff --git a/juick-xmpp-wip/src/main/java/com/juick/components/XMPPRouter.java b/juick-xmpp-wip/src/main/java/com/juick/components/XMPPRouter.java index 47e76cd8..0fad892d 100644 --- a/juick-xmpp-wip/src/main/java/com/juick/components/XMPPRouter.java +++ b/juick-xmpp-wip/src/main/java/com/juick/components/XMPPRouter.java @@ -17,7 +17,7 @@ package com.juick.components; -import com.juick.components.s2s.BasicXmppSession; +import com.juick.xmpp.s2s.BasicXmppSession; import com.juick.xmpp.Message; import com.juick.xmpp.StreamComponentServer; import com.juick.xmpp.StreamListener; diff --git a/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java b/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java index 971e849a..1f7107bf 100644 --- a/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java +++ b/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java @@ -18,11 +18,11 @@ package com.juick.xmpp; import com.gargoylesoftware.htmlunit.WebClient; -import com.juick.components.XMPPConnection; import com.juick.components.XMPPRouter; -import com.juick.components.configuration.XmppAppConfiguration; import com.juick.configuration.MockDataConfiguration; +import com.juick.server.XMPPConnection; import com.juick.server.configuration.BaseWebConfiguration; +import com.juick.server.configuration.XmppAppConfiguration; import com.juick.service.PrivacyQueriesService; import com.juick.service.ShowQueriesService; import org.junit.Before; |