14 files changed, 37 insertions, 34 deletions
diff --git a/juick-api/build.gradle b/juick-api/build.gradle
index 046a8401..c4d5f074 100644
--- a/juick-api/build.gradle
+++ b/juick-api/build.gradle
@@ -19,9 +19,6 @@ repositories {
 dependencies {
     compile project(':juick-core')
     compile project(':deps:com.juick.xmpp')
-    compile 'org.slf4j:slf4j-jdk14:1.7.21'
-    compile 'com.ganyo:gcm-server:1.0.+'
-    compile 'com.notnoop.apns:apns:1.0.0.Beta6'
     compile "org.apache.commons:commons-lang3:3.4"
     compile "org.springframework:spring-jdbc:4.3.2.RELEASE"
     providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
diff --git a/juick-api/src/main/webapp/WEB-INF/web.xml b/juick-api/src/main/webapp/WEB-INF/web.xml
index c79efd29..533a6882 100644
--- a/juick-api/src/main/webapp/WEB-INF/web.xml
+++ b/juick-api/src/main/webapp/WEB-INF/web.xml
@@ -13,19 +13,4 @@
             30
         </session-timeout>
     </session-config>
-    <listener>
-        <description>APNS/GCM/MPNS module</description>
-        <display-name>PushComponent</display-name>
-        <listener-class>com.juick.components.PushComponent</listener-class>
-    </listener>
-    <listener>
-        <description>Crossposting module</description>
-        <display-name>CrosspostComponent</display-name>
-        <listener-class>com.juick.components.CrosspostComponent</listener-class>
-    </listener>
-    <listener>
-        <description>XMPP module</description>
-        <display-name>XMPPComponent</display-name>
-        <listener-class>com.juick.components.XMPPComponent</listener-class>
-    </listener>
 </web-app>
diff --git a/juick-ws/build.gradle b/juick-ws/build.gradle
index 8200b408..99f37f96 100644
--- a/juick-ws/build.gradle
+++ b/juick-ws/build.gradle
@@ -17,6 +17,9 @@ repositories {
 dependencies {
     compile project(':juick-core')
     compile project(':deps:com.juick.xmpp')
+    compile 'org.slf4j:slf4j-jdk14:1.7.21'
+    compile 'com.ganyo:gcm-server:1.0.+'
+    compile 'com.notnoop.apns:apns:1.0.0.Beta6'
     providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
     def springFrameworkVersion = '4.3.2.RELEASE'
     compile "org.springframework:spring-jdbc:${springFrameworkVersion}"
diff --git a/juick-api/src/main/java/com/juick/components/CrosspostComponent.java b/juick-ws/src/main/java/com/juick/ws/components/CrosspostComponent.java
index b0e55719..ec5716ee 100644
--- a/juick-api/src/main/java/com/juick/components/CrosspostComponent.java
+++ b/juick-ws/src/main/java/com/juick/ws/components/CrosspostComponent.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.juick.components;
+package com.juick.ws.components;
 
 import com.juick.server.CrosspostQueries;
 import com.juick.xmpp.JID;
diff --git a/juick-api/src/main/java/com/juick/components/PushComponent.java b/juick-ws/src/main/java/com/juick/ws/components/PushComponent.java
index baac2532..eeb27184 100644
--- a/juick-api/src/main/java/com/juick/components/PushComponent.java
+++ b/juick-ws/src/main/java/com/juick/ws/components/PushComponent.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.juick.components;
+package com.juick.ws.components;
 
 import com.google.android.gcm.server.Message;
 import com.google.android.gcm.server.MulticastResult;
diff --git a/juick-api/src/main/java/com/juick/components/XMPPComponent.java b/juick-ws/src/main/java/com/juick/ws/components/XMPPComponent.java
index 7b31ac59..4e2f6d57 100644
--- a/juick-api/src/main/java/com/juick/components/XMPPComponent.java
+++ b/juick-ws/src/main/java/com/juick/ws/components/XMPPComponent.java
@@ -1,4 +1,4 @@
-package com.juick.components;
+package com.juick.ws.components;
 
 import com.juick.User;
 import com.juick.server.MessagesQueries;
@@ -8,7 +8,7 @@ import com.juick.xmpp.*;
 import com.juick.xmpp.extensions.JuickMessage;
 import com.juick.xmpp.extensions.Nickname;
 import com.juick.xmpp.extensions.XOOB;
-import com.juick.xmpp.s2s.*;
+import com.juick.ws.s2s.*;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.xmlpull.v1.XmlPullParserException;
diff --git a/juick-api/src/main/java/com/juick/xmpp/s2s/CacheEntry.java b/juick-ws/src/main/java/com/juick/ws/s2s/CacheEntry.java
index 7cdb18ab..e870e0d8 100644
--- a/juick-api/src/main/java/com/juick/xmpp/s2s/CacheEntry.java
+++ b/juick-ws/src/main/java/com/juick/ws/s2s/CacheEntry.java
@@ -1,4 +1,4 @@
-package com.juick.xmpp.s2s;
+package com.juick.ws.s2s;
 
 /**
  *
diff --git a/juick-api/src/main/java/com/juick/xmpp/s2s/CleaningUp.java b/juick-ws/src/main/java/com/juick/ws/s2s/CleaningUp.java
index 812a88ba..8140c829 100644
--- a/juick-api/src/main/java/com/juick/xmpp/s2s/CleaningUp.java
+++ b/juick-ws/src/main/java/com/juick/ws/s2s/CleaningUp.java
@@ -1,6 +1,6 @@
-package com.juick.xmpp.s2s;
+package com.juick.ws.s2s;
 
-import com.juick.components.XMPPComponent;
+import com.juick.ws.components.XMPPComponent;
 
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
diff --git a/juick-api/src/main/java/com/juick/xmpp/s2s/Connection.java b/juick-ws/src/main/java/com/juick/ws/s2s/Connection.java
index fe82b878..77c12d1d 100644
--- a/juick-api/src/main/java/com/juick/xmpp/s2s/Connection.java
+++ b/juick-ws/src/main/java/com/juick/ws/s2s/Connection.java
@@ -1,6 +1,6 @@
-package com.juick.xmpp.s2s;
+package com.juick.ws.s2s;
 
-import com.juick.components.XMPPComponent;
+import com.juick.ws.components.XMPPComponent;
 import org.xmlpull.mxp1.MXParser;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
diff --git a/juick-api/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java b/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionIn.java
index d8b90f13..a57623c4 100644
--- a/juick-api/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java
+++ b/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionIn.java
@@ -1,6 +1,6 @@
-package com.juick.xmpp.s2s;
+package com.juick.ws.s2s;
 
-import com.juick.components.XMPPComponent;
+import com.juick.ws.components.XMPPComponent;
 import com.juick.xmpp.Iq;
 import com.juick.xmpp.JID;
 import com.juick.xmpp.Message;
diff --git a/juick-api/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java b/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionOut.java
index a5e7705b..1de16329 100644
--- a/juick-api/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java
+++ b/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionOut.java
@@ -1,6 +1,6 @@
-package com.juick.xmpp.s2s;
+package com.juick.ws.s2s;
 
-import com.juick.components.XMPPComponent;
+import com.juick.ws.components.XMPPComponent;
 import com.juick.xmpp.extensions.StreamFeatures;
 import com.juick.xmpp.utils.XmlUtils;
 import org.xmlpull.v1.XmlPullParser;
diff --git a/juick-api/src/main/java/com/juick/xmpp/s2s/DNSQueries.java b/juick-ws/src/main/java/com/juick/ws/s2s/DNSQueries.java
index e4c5f085..35e72c2b 100644
--- a/juick-api/src/main/java/com/juick/xmpp/s2s/DNSQueries.java
+++ b/juick-ws/src/main/java/com/juick/ws/s2s/DNSQueries.java
@@ -1,4 +1,4 @@
-package com.juick.xmpp.s2s;
+package com.juick.ws.s2s;
 
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
diff --git a/juick-api/src/main/java/com/juick/xmpp/s2s/JuickBot.java b/juick-ws/src/main/java/com/juick/ws/s2s/JuickBot.java
index ca7e6a34..f5500242 100644
--- a/juick-api/src/main/java/com/juick/xmpp/s2s/JuickBot.java
+++ b/juick-ws/src/main/java/com/juick/ws/s2s/JuickBot.java
@@ -1,7 +1,7 @@
-package com.juick.xmpp.s2s;
+package com.juick.ws.s2s;
 
 import com.juick.User;
-import com.juick.components.XMPPComponent;
+import com.juick.ws.components.XMPPComponent;
 import com.juick.server.PMQueries;
 import com.juick.server.TagQueries;
 import com.juick.server.UserQueries;
diff --git a/juick-ws/src/main/webapp/WEB-INF/web.xml b/juick-ws/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000..a040035c
--- /dev/null
+++ b/juick-ws/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+    <listener>
+        <description>APNS/GCM/MPNS module</description>
+        <display-name>PushComponent</display-name>
+        <listener-class>com.juick.ws.components.PushComponent</listener-class>
+    </listener>
+    <listener>
+        <description>Crossposting module</description>
+        <display-name>CrosspostComponent</display-name>
+        <listener-class>com.juick.ws.components.CrosspostComponent</listener-class>
+    </listener>
+    <listener>
+        <description>XMPP module</description>
+        <display-name>XMPPComponent</display-name>
+        <listener-class>com.juick.ws.components.XMPPComponent</listener-class>
+    </listener>
+</web-app>