41 files changed, 65 insertions, 34 deletions
diff --git a/juick-api/build.gradle b/juick-api/build.gradle
index 30e2a94a..7e257ac3 100644
--- a/juick-api/build.gradle
+++ b/juick-api/build.gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    compile project(':juick-core')
+    compile project(':server-core')
     compile project(':deps:com.juick.xmpp')
     providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
     compile 'com.github.pengrad:java-telegram-bot-api:2.1.4'
diff --git a/juick-core/build.gradle b/juick-core/build.gradle
index e3a35e29..59cbf6c9 100644
--- a/juick-core/build.gradle
+++ b/juick-core/build.gradle
@@ -5,34 +5,17 @@ repositories {
     mavenCentral()
 }
 
-def jacksonVersion = '2.8.4'
-def logbackVersion = '1.1.7'
 def slf4jVersion = '1.7.21'
-def springFrameworkVersion = '4.3.4.RELEASE'
 
 dependencies {
     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}"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jacksonVersion}"
-    compile "ch.qos.logback:logback-classic:${logbackVersion}"
-    compile "ch.qos.logback:logback-core:${logbackVersion}"
-    compile "ch.qos.logback:logback-access:${logbackVersion}"
     compile "org.slf4j:slf4j-api:${slf4jVersion}"
-    compile "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
-    compile "org.slf4j:log4j-over-slf4j:${slf4jVersion}"
-    compile "org.slf4j:jul-to-slf4j:${slf4jVersion}"
     compile 'org.apache.httpcomponents:httpclient:4.5.2'
     compile 'org.apache.commons:commons-lang3:3.5'
     compile 'org.apache.commons:commons-collections4:4.1'
     compile 'commons-io:commons-io:2.5'
-    compile "org.springframework:spring-context:${springFrameworkVersion}"
-    compile "org.springframework:spring-jdbc:${springFrameworkVersion}"
-    compile 'org.apache.commons:commons-dbcp2:2.1.1'
     compile 'org.json:json:20160810'
-    compile 'javax.inject:javax.inject:1'
 }
 
 compileJava.options.encoding = 'UTF-8'
diff --git a/juick-crosspost/build.gradle b/juick-crosspost/build.gradle
index 21b7019e..49fa86f9 100644
--- a/juick-crosspost/build.gradle
+++ b/juick-crosspost/build.gradle
@@ -10,7 +10,7 @@ repositories {
 def springFrameworkVersion = '4.3.4.RELEASE'
 
 dependencies {
-    compile project(':juick-core')
+    compile project(':server-core')
     compile "org.springframework:spring-webmvc:${springFrameworkVersion}"
     compile 'com.mitchellbosecke:pebble-spring4:2.2.3'
     providedRuntime 'mysql:mysql-connector-java:5.1.40'
diff --git a/juick-demo/build.gradle b/juick-demo/build.gradle
index 3ac52b52..4644ea87 100644
--- a/juick-demo/build.gradle
+++ b/juick-demo/build.gradle
@@ -16,7 +16,7 @@ repositories {
 mainClassName = "com.juick.demo.Demo"
 
 dependencies {
-    compile project(':juick-core')
+    compile project(':server-core')
     compile 'mysql:mysql-connector-java:5.1.40'
     compile 'ch.vorburger.mariaDB4j:mariaDB4j:2.2.2'
     compile 'jline:jline:2.14.2'
diff --git a/juick-notifications/build.gradle b/juick-notifications/build.gradle
index c8a2479d..a55da11a 100644
--- a/juick-notifications/build.gradle
+++ b/juick-notifications/build.gradle
@@ -10,7 +10,7 @@ repositories {
 def springFrameworkVersion = '4.3.4.RELEASE'
 
 dependencies {
-    compile project(':juick-core')
+    compile project(':server-core')
     compile 'com.ganyo:gcm-server:1.1.0'
     compile 'com.notnoop.apns:apns:1.0.0.Beta6'
     compile "org.springframework:spring-webmvc:${springFrameworkVersion}"
diff --git a/juick-rss/build.gradle b/juick-rss/build.gradle
index d18d1dd8..9e820d91 100644
--- a/juick-rss/build.gradle
+++ b/juick-rss/build.gradle
@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-    compile project(':juick-core')
+    compile project(':server-core')
     providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
     providedRuntime 'mysql:mysql-connector-java:5.1.40'
 }
diff --git a/juick-ws/build.gradle b/juick-ws/build.gradle
index 51f8c401..80afdcd7 100644
--- a/juick-ws/build.gradle
+++ b/juick-ws/build.gradle
@@ -18,7 +18,7 @@ repositories {
 def springFrameworkVersion = '4.3.4.RELEASE'
 
 dependencies {
-    compile project(':juick-core')
+    compile project(':server-core')
     compile project(':deps:com.juick.xmpp')
     compile "org.springframework:spring-webmvc:${springFrameworkVersion}"
     compile "org.springframework:spring-websocket:${springFrameworkVersion}"
diff --git a/juick-ws/src/main/java/com/juick/ws/WebsocketComponent.java b/juick-ws/src/main/java/com/juick/ws/WebsocketComponent.java
index 4ce230a4..ac53b2ad 100644
--- a/juick-ws/src/main/java/com/juick/ws/WebsocketComponent.java
+++ b/juick-ws/src/main/java/com/juick/ws/WebsocketComponent.java
@@ -14,7 +14,6 @@ import org.springframework.web.socket.CloseStatus;
 import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.handler.TextWebSocketHandler;
 
-import javax.inject.Inject;
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
diff --git a/juick-www/build.gradle b/juick-www/build.gradle
index 36eae244..1bed582b 100644
--- a/juick-www/build.gradle
+++ b/juick-www/build.gradle
@@ -26,18 +26,19 @@ repositories {
     mavenCentral()
 }
 
-def slf4jVersion = '1.7.21'
+def springFrameworkVersion = '4.3.4.RELEASE'
 
 dependencies {
-    compile project(':juick-core')
+    compile project(':server-core')
     compile project(':deps:com.juick.xmpp')
     compile 'com.github.scribejava:scribejava-apis:3.2.0'
-    compile 'commons-io:commons-io:2.5'
     compile 'net.coobird:thumbnailator:0.4.8'
     compile 'com.github.ooxi:serialized-php-parser:0.5.0'
     compile 'net.jodah:failsafe:0.9.5'
     compile 'com.mitchellbosecke:pebble:2.2.3'
     compile 'com.sun.mail:javax.mail:1.5.6'
+    compile "org.springframework:spring-webmvc:${springFrameworkVersion}"
+    compile 'com.mitchellbosecke:pebble-spring4:2.2.3'
     providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
     providedRuntime 'mysql:mysql-connector-java:5.1.40'
 }
diff --git a/juick-www/src/main/java/com/juick/www/Settings.java b/juick-www/src/main/java/com/juick/www/Settings.java
index 0d427efe..8fe14615 100644
--- a/juick-www/src/main/java/com/juick/www/Settings.java
+++ b/juick-www/src/main/java/com/juick/www/Settings.java
@@ -43,8 +43,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Part;
-import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Files;
diff --git a/juick-xmpp-bot/build.gradle b/juick-xmpp-bot/build.gradle
index 2950d081..5f458fa9 100644
--- a/juick-xmpp-bot/build.gradle
+++ b/juick-xmpp-bot/build.gradle
@@ -11,7 +11,7 @@ repositories {
 def springFrameworkVersion = '4.3.4.RELEASE'
 
 dependencies {
-    compile project(':juick-core')
+    compile project(':server-core')
     compile "org.springframework:spring-webmvc:${springFrameworkVersion}"
     compile 'com.mitchellbosecke:pebble-spring4:2.2.3'
     compile 'org.bitbucket.sco0ter.babbler:xmpp-core-client:279e488e51'
diff --git a/juick-xmpp-ft/build.gradle b/juick-xmpp-ft/build.gradle
index 2950d081..5f458fa9 100644
--- a/juick-xmpp-ft/build.gradle
+++ b/juick-xmpp-ft/build.gradle
@@ -11,7 +11,7 @@ repositories {
 def springFrameworkVersion = '4.3.4.RELEASE'
 
 dependencies {
-    compile project(':juick-core')
+    compile project(':server-core')
     compile "org.springframework:spring-webmvc:${springFrameworkVersion}"
     compile 'com.mitchellbosecke:pebble-spring4:2.2.3'
     compile 'org.bitbucket.sco0ter.babbler:xmpp-core-client:279e488e51'
diff --git a/juick-xmpp/build.gradle b/juick-xmpp/build.gradle
index d50a68b8..b05762c4 100644
--- a/juick-xmpp/build.gradle
+++ b/juick-xmpp/build.gradle
@@ -12,7 +12,7 @@ def jacksonVersion = '2.8.4'
 def slf4jVersion = '1.7.21'
 
 dependencies {
-    compile project(':juick-core')
+    compile project(':server-core')
     compile "org.slf4j:slf4j-api:${slf4jVersion}"
     compile "org.springframework:spring-webmvc:${springFrameworkVersion}"
     compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
diff --git a/readme.txt b/readme.txt
index 92f080d1..8af7c96e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -8,7 +8,7 @@ mysql -u user -p
 	create database juick;
 	exit
 
-mysql -u user -p < juick-core/src/main/resources/schema.sql
+mysql -u user -p < server-core/src/main/resources/schema.sql
 
 mysql -u user -p
 	use juick;
diff --git a/server-core/build.gradle b/server-core/build.gradle
new file mode 100644
index 00000000..f082e2c8
--- /dev/null
+++ b/server-core/build.gradle
@@ -0,0 +1,50 @@
+apply plugin: 'java'
+apply plugin: 'com.github.ben-manes.versions'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+def jacksonVersion = '2.8.4'
+def logbackVersion = '1.1.7'
+def slf4jVersion = '1.7.21'
+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}"
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jacksonVersion}"
+
+    compile "ch.qos.logback:logback-classic:${logbackVersion}"
+    compile "ch.qos.logback:logback-core:${logbackVersion}"
+    compile "ch.qos.logback:logback-access:${logbackVersion}"
+
+    compile "org.slf4j:slf4j-api:${slf4jVersion}"
+    compile "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
+    compile "org.slf4j:log4j-over-slf4j:${slf4jVersion}"
+    compile "org.slf4j:jul-to-slf4j:${slf4jVersion}"
+
+    compile 'org.apache.httpcomponents:httpclient:4.5.2'
+    compile 'org.apache.commons:commons-lang3:3.5'
+    compile 'org.apache.commons:commons-collections4:4.1'
+    compile 'commons-io:commons-io:2.5'
+
+    compile "org.springframework:spring-context:${springFrameworkVersion}"
+    compile "org.springframework:spring-jdbc:${springFrameworkVersion}"
+
+    compile 'org.apache.commons:commons-dbcp2:2.1.1'
+    compile 'org.json:json:20160810'
+    compile 'javax.inject:javax.inject:1'
+}
+
+compileJava.options.encoding = 'UTF-8'
+
+configurations {
+    all*.exclude module: 'commons-logging'
+}
diff --git a/juick-core/src/main/java/com/juick/configuration/DataConfiguration.java b/server-core/src/main/java/com/juick/configuration/DataConfiguration.java
index f31dbcdb..f31dbcdb 100644
--- a/juick-core/src/main/java/com/juick/configuration/DataConfiguration.java
+++ b/server-core/src/main/java/com/juick/configuration/DataConfiguration.java
diff --git a/juick-core/src/main/java/com/juick/server/AdsQueries.java b/server-core/src/main/java/com/juick/server/AdsQueries.java
index 06590817..06590817 100644
--- a/juick-core/src/main/java/com/juick/server/AdsQueries.java
+++ b/server-core/src/main/java/com/juick/server/AdsQueries.java
diff --git a/juick-core/src/main/java/com/juick/server/CrosspostQueries.java b/server-core/src/main/java/com/juick/server/CrosspostQueries.java
index 827dad09..827dad09 100644
--- a/juick-core/src/main/java/com/juick/server/CrosspostQueries.java
+++ b/server-core/src/main/java/com/juick/server/CrosspostQueries.java
diff --git a/juick-core/src/main/java/com/juick/server/MessagesQueries.java b/server-core/src/main/java/com/juick/server/MessagesQueries.java
index b824feba..b824feba 100644
--- a/juick-core/src/main/java/com/juick/server/MessagesQueries.java
+++ b/server-core/src/main/java/com/juick/server/MessagesQueries.java
diff --git a/juick-core/src/main/java/com/juick/server/PMQueries.java b/server-core/src/main/java/com/juick/server/PMQueries.java
index d7855002..d7855002 100644
--- a/juick-core/src/main/java/com/juick/server/PMQueries.java
+++ b/server-core/src/main/java/com/juick/server/PMQueries.java
diff --git a/juick-core/src/main/java/com/juick/server/PrivacyQueries.java b/server-core/src/main/java/com/juick/server/PrivacyQueries.java
index 53b13505..53b13505 100644
--- a/juick-core/src/main/java/com/juick/server/PrivacyQueries.java
+++ b/server-core/src/main/java/com/juick/server/PrivacyQueries.java
diff --git a/juick-core/src/main/java/com/juick/server/PushQueries.java b/server-core/src/main/java/com/juick/server/PushQueries.java
index 904b3c0d..904b3c0d 100644
--- a/juick-core/src/main/java/com/juick/server/PushQueries.java
+++ b/server-core/src/main/java/com/juick/server/PushQueries.java
diff --git a/juick-core/src/main/java/com/juick/server/ShowQueries.java b/server-core/src/main/java/com/juick/server/ShowQueries.java
index b55117c1..b55117c1 100644
--- a/juick-core/src/main/java/com/juick/server/ShowQueries.java
+++ b/server-core/src/main/java/com/juick/server/ShowQueries.java
diff --git a/juick-core/src/main/java/com/juick/server/SubscriptionsQueries.java b/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java
index 9a09a5cd..9a09a5cd 100644
--- a/juick-core/src/main/java/com/juick/server/SubscriptionsQueries.java
+++ b/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java
diff --git a/juick-core/src/main/java/com/juick/server/TagQueries.java b/server-core/src/main/java/com/juick/server/TagQueries.java
index 0e3c0c06..0e3c0c06 100644
--- a/juick-core/src/main/java/com/juick/server/TagQueries.java
+++ b/server-core/src/main/java/com/juick/server/TagQueries.java
diff --git a/juick-core/src/main/java/com/juick/server/UserQueries.java b/server-core/src/main/java/com/juick/server/UserQueries.java
index 50e3562f..50e3562f 100644
--- a/juick-core/src/main/java/com/juick/server/UserQueries.java
+++ b/server-core/src/main/java/com/juick/server/UserQueries.java
diff --git a/juick-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java b/server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java
index 986c8275..986c8275 100644
--- a/juick-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java
+++ b/server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java
diff --git a/juick-core/src/main/java/com/juick/server/helpers/Auth.java b/server-core/src/main/java/com/juick/server/helpers/Auth.java
index 3e1f0bd9..3e1f0bd9 100644
--- a/juick-core/src/main/java/com/juick/server/helpers/Auth.java
+++ b/server-core/src/main/java/com/juick/server/helpers/Auth.java
diff --git a/juick-core/src/main/java/com/juick/server/helpers/EmailOpts.java b/server-core/src/main/java/com/juick/server/helpers/EmailOpts.java
index 679d1a8d..679d1a8d 100644
--- a/juick-core/src/main/java/com/juick/server/helpers/EmailOpts.java
+++ b/server-core/src/main/java/com/juick/server/helpers/EmailOpts.java
diff --git a/juick-core/src/main/java/com/juick/server/helpers/NotifyOpts.java b/server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java
index 377b0a50..377b0a50 100644
--- a/juick-core/src/main/java/com/juick/server/helpers/NotifyOpts.java
+++ b/server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java
diff --git a/juick-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java b/server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java
index 66cf9410..66cf9410 100644
--- a/juick-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java
+++ b/server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java
diff --git a/juick-core/src/main/java/com/juick/server/helpers/Status.java b/server-core/src/main/java/com/juick/server/helpers/Status.java
index f68baae5..f68baae5 100644
--- a/juick-core/src/main/java/com/juick/server/helpers/Status.java
+++ b/server-core/src/main/java/com/juick/server/helpers/Status.java
diff --git a/juick-core/src/main/java/com/juick/server/helpers/UserInfo.java b/server-core/src/main/java/com/juick/server/helpers/UserInfo.java
index 5a4b6894..5a4b6894 100644
--- a/juick-core/src/main/java/com/juick/server/helpers/UserInfo.java
+++ b/server-core/src/main/java/com/juick/server/helpers/UserInfo.java
diff --git a/juick-core/src/main/java/com/juick/server/protocol/JuickProtocol.java b/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java
index 5faddd3a..5faddd3a 100644
--- a/juick-core/src/main/java/com/juick/server/protocol/JuickProtocol.java
+++ b/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java
diff --git a/juick-core/src/main/java/com/juick/server/protocol/ProtocolReply.java b/server-core/src/main/java/com/juick/server/protocol/ProtocolReply.java
index d9d36a5d..d9d36a5d 100644
--- a/juick-core/src/main/java/com/juick/server/protocol/ProtocolReply.java
+++ b/server-core/src/main/java/com/juick/server/protocol/ProtocolReply.java
diff --git a/juick-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java b/server-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
index af7c4924..af7c4924 100644
--- a/juick-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
+++ b/server-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
diff --git a/juick-core/src/main/java/com/juick/util/ThreadHelper.java b/server-core/src/main/java/com/juick/util/ThreadHelper.java
index 7304d158..7304d158 100644
--- a/juick-core/src/main/java/com/juick/util/ThreadHelper.java
+++ b/server-core/src/main/java/com/juick/util/ThreadHelper.java
diff --git a/juick-core/src/main/resources/juick.conf.example b/server-core/src/main/resources/juick.conf.example
index 306a4e93..306a4e93 100644
--- a/juick-core/src/main/resources/juick.conf.example
+++ b/server-core/src/main/resources/juick.conf.example
diff --git a/juick-core/src/main/resources/logback.xml.example b/server-core/src/main/resources/logback.xml.example
index 05a3cfdf..05a3cfdf 100644
--- a/juick-core/src/main/resources/logback.xml.example
+++ b/server-core/src/main/resources/logback.xml.example
diff --git a/juick-core/src/main/resources/schema.sql b/server-core/src/main/resources/schema.sql
index 90bb4ed4..90bb4ed4 100644
--- a/juick-core/src/main/resources/schema.sql
+++ b/server-core/src/main/resources/schema.sql
diff --git a/settings.gradle b/settings.gradle
index 96d89576..f1b637e5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':deps:com.juick.xmpp', ':juick-core', ':juick-api', ':juick-www', ':juick-rss', ':juick-ws', ':juick-demo', ':juick-notifications', ':juick-crosspost', ':juick-xmpp', ':juick-xmpp-ft', ':juick-xmpp-bot'
+include ':deps:com.juick.xmpp', ':juick-core', 'server-core', ':juick-api', ':juick-www', ':juick-rss', ':juick-ws', ':juick-demo', ':juick-notifications', ':juick-crosspost', ':juick-xmpp', ':juick-xmpp-ft', ':juick-xmpp-bot'