diff options
-rw-r--r-- | juick-api/build.gradle | 2 | ||||
-rw-r--r-- | juick-crosspost/build.gradle | 2 | ||||
-rw-r--r-- | juick-demo/build.gradle | 2 | ||||
-rw-r--r-- | juick-notifications/build.gradle | 2 | ||||
-rw-r--r-- | juick-rss/build.gradle | 2 | ||||
-rw-r--r-- | juick-server/build.gradle (renamed from server-core/build.gradle) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/configuration/DataConfiguration.java (renamed from server-core/src/main/java/com/juick/configuration/DataConfiguration.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/AdsQueries.java (renamed from server-core/src/main/java/com/juick/server/AdsQueries.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/CrosspostQueries.java (renamed from server-core/src/main/java/com/juick/server/CrosspostQueries.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/MessagesQueries.java (renamed from server-core/src/main/java/com/juick/server/MessagesQueries.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/PMQueries.java (renamed from server-core/src/main/java/com/juick/server/PMQueries.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/PrivacyQueries.java (renamed from server-core/src/main/java/com/juick/server/PrivacyQueries.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/PushQueries.java (renamed from server-core/src/main/java/com/juick/server/PushQueries.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/ShowQueries.java (renamed from server-core/src/main/java/com/juick/server/ShowQueries.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/SubscriptionsQueries.java (renamed from server-core/src/main/java/com/juick/server/SubscriptionsQueries.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/TagQueries.java (renamed from server-core/src/main/java/com/juick/server/TagQueries.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/UserQueries.java (renamed from server-core/src/main/java/com/juick/server/UserQueries.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/helpers/ApplicationStatus.java (renamed from server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/helpers/Auth.java (renamed from server-core/src/main/java/com/juick/server/helpers/Auth.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/helpers/EmailOpts.java (renamed from server-core/src/main/java/com/juick/server/helpers/EmailOpts.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/helpers/NotifyOpts.java (renamed from server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/helpers/PrivacyOpts.java (renamed from server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/helpers/Status.java (renamed from server-core/src/main/java/com/juick/server/helpers/Status.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/helpers/UserInfo.java (renamed from server-core/src/main/java/com/juick/server/helpers/UserInfo.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java (renamed from server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/protocol/ProtocolReply.java (renamed from server-core/src/main/java/com/juick/server/protocol/ProtocolReply.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/protocol/annotation/UserCommand.java (renamed from server-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/AdsService.java (renamed from server-core/src/main/java/com/juick/service/AdsService.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/AdsServiceImpl.java (renamed from server-core/src/main/java/com/juick/service/AdsServiceImpl.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/BaseJdbcService.java (renamed from server-core/src/main/java/com/juick/service/BaseJdbcService.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/CrosspostService.java (renamed from server-core/src/main/java/com/juick/service/CrosspostService.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/CrosspostServiceImpl.java (renamed from server-core/src/main/java/com/juick/service/CrosspostServiceImpl.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/MessagesService.java (renamed from server-core/src/main/java/com/juick/service/MessagesService.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java (renamed from server-core/src/main/java/com/juick/service/MessagesServiceImpl.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/PMQueriesService.java (renamed from server-core/src/main/java/com/juick/service/PMQueriesService.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/PMQueriesServiceImpl.java (renamed from server-core/src/main/java/com/juick/service/PMQueriesServiceImpl.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/PrivacyQueriesService.java (renamed from server-core/src/main/java/com/juick/service/PrivacyQueriesService.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java (renamed from server-core/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/PushQueriesService.java (renamed from server-core/src/main/java/com/juick/service/PushQueriesService.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/PushQueriesServiceImpl.java (renamed from server-core/src/main/java/com/juick/service/PushQueriesServiceImpl.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/ShowQueriesService.java (renamed from server-core/src/main/java/com/juick/service/ShowQueriesService.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/ShowQueriesServiceImpl.java (renamed from server-core/src/main/java/com/juick/service/ShowQueriesServiceImpl.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/SubscriptionService.java (renamed from server-core/src/main/java/com/juick/service/SubscriptionService.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java (renamed from server-core/src/main/java/com/juick/service/SubscriptionServiceImpl.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/TagService.java (renamed from server-core/src/main/java/com/juick/service/TagService.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/TagServiceImpl.java (renamed from server-core/src/main/java/com/juick/service/TagServiceImpl.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/UserService.java (renamed from server-core/src/main/java/com/juick/service/UserService.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/UserServiceImpl.java (renamed from server-core/src/main/java/com/juick/service/UserServiceImpl.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/util/TagUtils.java (renamed from server-core/src/main/java/com/juick/util/TagUtils.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/util/ThreadHelper.java (renamed from server-core/src/main/java/com/juick/util/ThreadHelper.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/util/UserUtils.java (renamed from server-core/src/main/java/com/juick/util/UserUtils.java) | 0 | ||||
-rw-r--r-- | juick-server/src/main/resources/juick.conf.example (renamed from server-core/src/main/resources/juick.conf.example) | 0 | ||||
-rw-r--r-- | juick-server/src/main/resources/logback.xml.example (renamed from server-core/src/main/resources/logback.xml.example) | 0 | ||||
-rw-r--r-- | juick-server/src/main/resources/schema.sql (renamed from server-core/src/main/resources/schema.sql) | 0 | ||||
-rw-r--r-- | juick-ws/build.gradle | 2 | ||||
-rw-r--r-- | juick-www/build.gradle | 2 | ||||
-rw-r--r-- | juick-xmpp-bot/build.gradle | 2 | ||||
-rw-r--r-- | juick-xmpp-ft/build.gradle | 2 | ||||
-rw-r--r-- | juick-xmpp/build.gradle | 2 | ||||
-rw-r--r-- | readme.txt | 2 | ||||
-rw-r--r-- | settings.gradle | 2 |
61 files changed, 12 insertions, 12 deletions
diff --git a/juick-api/build.gradle b/juick-api/build.gradle index da1a4638..c80546a5 100644 --- a/juick-api/build.gradle +++ b/juick-api/build.gradle @@ -19,7 +19,7 @@ repositories { } dependencies { - compile project(':server-core') + compile project(':juick-server') compile 'org.bitbucket.sco0ter.babbler:xmpp-core-client:279e488e51' compile 'org.bitbucket.sco0ter.babbler:xmpp-extensions-client:279e488e51' providedCompile 'javax.servlet:javax.servlet-api:3.1.0' diff --git a/juick-crosspost/build.gradle b/juick-crosspost/build.gradle index 6f28bc1f..d96e59b3 100644 --- a/juick-crosspost/build.gradle +++ b/juick-crosspost/build.gradle @@ -11,7 +11,7 @@ repositories { def springFrameworkVersion = '4.3.4.RELEASE' dependencies { - compile project(':server-core') + compile project(':juick-server') compile 'org.bitbucket.sco0ter.babbler:xmpp-core-client:279e488e51' compile 'org.bitbucket.sco0ter.babbler:xmpp-extensions-client:279e488e51' compile "org.springframework:spring-webmvc:${springFrameworkVersion}" diff --git a/juick-demo/build.gradle b/juick-demo/build.gradle index 4644ea87..5ae85d83 100644 --- a/juick-demo/build.gradle +++ b/juick-demo/build.gradle @@ -16,7 +16,7 @@ repositories { mainClassName = "com.juick.demo.Demo" dependencies { - compile project(':server-core') + compile project(':juick-server') 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 c8350adb..1928507e 100644 --- a/juick-notifications/build.gradle +++ b/juick-notifications/build.gradle @@ -11,7 +11,7 @@ repositories { def springFrameworkVersion = '4.3.4.RELEASE' dependencies { - compile project(':server-core') + compile project(':juick-server') compile 'org.bitbucket.sco0ter.babbler:xmpp-core-client:279e488e51' compile 'org.bitbucket.sco0ter.babbler:xmpp-extensions-client:279e488e51' compile 'com.ganyo:gcm-server:1.1.0' diff --git a/juick-rss/build.gradle b/juick-rss/build.gradle index 9e820d91..44af4eb9 100644 --- a/juick-rss/build.gradle +++ b/juick-rss/build.gradle @@ -8,7 +8,7 @@ repositories { } dependencies { - compile project(':server-core') + compile project(':juick-server') providedCompile 'javax.servlet:javax.servlet-api:3.1.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' } diff --git a/server-core/build.gradle b/juick-server/build.gradle index 705b7675..705b7675 100644 --- a/server-core/build.gradle +++ b/juick-server/build.gradle diff --git a/server-core/src/main/java/com/juick/configuration/DataConfiguration.java b/juick-server/src/main/java/com/juick/configuration/DataConfiguration.java index 88fc00b3..88fc00b3 100644 --- a/server-core/src/main/java/com/juick/configuration/DataConfiguration.java +++ b/juick-server/src/main/java/com/juick/configuration/DataConfiguration.java diff --git a/server-core/src/main/java/com/juick/server/AdsQueries.java b/juick-server/src/main/java/com/juick/server/AdsQueries.java index 06590817..06590817 100644 --- a/server-core/src/main/java/com/juick/server/AdsQueries.java +++ b/juick-server/src/main/java/com/juick/server/AdsQueries.java diff --git a/server-core/src/main/java/com/juick/server/CrosspostQueries.java b/juick-server/src/main/java/com/juick/server/CrosspostQueries.java index 827dad09..827dad09 100644 --- a/server-core/src/main/java/com/juick/server/CrosspostQueries.java +++ b/juick-server/src/main/java/com/juick/server/CrosspostQueries.java diff --git a/server-core/src/main/java/com/juick/server/MessagesQueries.java b/juick-server/src/main/java/com/juick/server/MessagesQueries.java index 9d4284bc..9d4284bc 100644 --- a/server-core/src/main/java/com/juick/server/MessagesQueries.java +++ b/juick-server/src/main/java/com/juick/server/MessagesQueries.java diff --git a/server-core/src/main/java/com/juick/server/PMQueries.java b/juick-server/src/main/java/com/juick/server/PMQueries.java index c79c04b6..c79c04b6 100644 --- a/server-core/src/main/java/com/juick/server/PMQueries.java +++ b/juick-server/src/main/java/com/juick/server/PMQueries.java diff --git a/server-core/src/main/java/com/juick/server/PrivacyQueries.java b/juick-server/src/main/java/com/juick/server/PrivacyQueries.java index 40fc82c4..40fc82c4 100644 --- a/server-core/src/main/java/com/juick/server/PrivacyQueries.java +++ b/juick-server/src/main/java/com/juick/server/PrivacyQueries.java diff --git a/server-core/src/main/java/com/juick/server/PushQueries.java b/juick-server/src/main/java/com/juick/server/PushQueries.java index 904b3c0d..904b3c0d 100644 --- a/server-core/src/main/java/com/juick/server/PushQueries.java +++ b/juick-server/src/main/java/com/juick/server/PushQueries.java diff --git a/server-core/src/main/java/com/juick/server/ShowQueries.java b/juick-server/src/main/java/com/juick/server/ShowQueries.java index fde388c3..fde388c3 100644 --- a/server-core/src/main/java/com/juick/server/ShowQueries.java +++ b/juick-server/src/main/java/com/juick/server/ShowQueries.java diff --git a/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java b/juick-server/src/main/java/com/juick/server/SubscriptionsQueries.java index 08d704d9..08d704d9 100644 --- a/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java +++ b/juick-server/src/main/java/com/juick/server/SubscriptionsQueries.java diff --git a/server-core/src/main/java/com/juick/server/TagQueries.java b/juick-server/src/main/java/com/juick/server/TagQueries.java index ee9a1e21..ee9a1e21 100644 --- a/server-core/src/main/java/com/juick/server/TagQueries.java +++ b/juick-server/src/main/java/com/juick/server/TagQueries.java diff --git a/server-core/src/main/java/com/juick/server/UserQueries.java b/juick-server/src/main/java/com/juick/server/UserQueries.java index 7400e6b2..7400e6b2 100644 --- a/server-core/src/main/java/com/juick/server/UserQueries.java +++ b/juick-server/src/main/java/com/juick/server/UserQueries.java diff --git a/server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java b/juick-server/src/main/java/com/juick/server/helpers/ApplicationStatus.java index 61109c47..61109c47 100644 --- a/server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java +++ b/juick-server/src/main/java/com/juick/server/helpers/ApplicationStatus.java diff --git a/server-core/src/main/java/com/juick/server/helpers/Auth.java b/juick-server/src/main/java/com/juick/server/helpers/Auth.java index 3e1f0bd9..3e1f0bd9 100644 --- a/server-core/src/main/java/com/juick/server/helpers/Auth.java +++ b/juick-server/src/main/java/com/juick/server/helpers/Auth.java diff --git a/server-core/src/main/java/com/juick/server/helpers/EmailOpts.java b/juick-server/src/main/java/com/juick/server/helpers/EmailOpts.java index 679d1a8d..679d1a8d 100644 --- a/server-core/src/main/java/com/juick/server/helpers/EmailOpts.java +++ b/juick-server/src/main/java/com/juick/server/helpers/EmailOpts.java diff --git a/server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java b/juick-server/src/main/java/com/juick/server/helpers/NotifyOpts.java index 377b0a50..377b0a50 100644 --- a/server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java +++ b/juick-server/src/main/java/com/juick/server/helpers/NotifyOpts.java diff --git a/server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java b/juick-server/src/main/java/com/juick/server/helpers/PrivacyOpts.java index 66cf9410..66cf9410 100644 --- a/server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java +++ b/juick-server/src/main/java/com/juick/server/helpers/PrivacyOpts.java diff --git a/server-core/src/main/java/com/juick/server/helpers/Status.java b/juick-server/src/main/java/com/juick/server/helpers/Status.java index f68baae5..f68baae5 100644 --- a/server-core/src/main/java/com/juick/server/helpers/Status.java +++ b/juick-server/src/main/java/com/juick/server/helpers/Status.java diff --git a/server-core/src/main/java/com/juick/server/helpers/UserInfo.java b/juick-server/src/main/java/com/juick/server/helpers/UserInfo.java index 5a4b6894..5a4b6894 100644 --- a/server-core/src/main/java/com/juick/server/helpers/UserInfo.java +++ b/juick-server/src/main/java/com/juick/server/helpers/UserInfo.java diff --git a/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java b/juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java index 6fa3790e..6fa3790e 100644 --- a/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java +++ b/juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java diff --git a/server-core/src/main/java/com/juick/server/protocol/ProtocolReply.java b/juick-server/src/main/java/com/juick/server/protocol/ProtocolReply.java index d9d36a5d..d9d36a5d 100644 --- a/server-core/src/main/java/com/juick/server/protocol/ProtocolReply.java +++ b/juick-server/src/main/java/com/juick/server/protocol/ProtocolReply.java diff --git a/server-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java b/juick-server/src/main/java/com/juick/server/protocol/annotation/UserCommand.java index af7c4924..af7c4924 100644 --- a/server-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java +++ b/juick-server/src/main/java/com/juick/server/protocol/annotation/UserCommand.java diff --git a/server-core/src/main/java/com/juick/service/AdsService.java b/juick-server/src/main/java/com/juick/service/AdsService.java index f8a0f5cf..f8a0f5cf 100644 --- a/server-core/src/main/java/com/juick/service/AdsService.java +++ b/juick-server/src/main/java/com/juick/service/AdsService.java diff --git a/server-core/src/main/java/com/juick/service/AdsServiceImpl.java b/juick-server/src/main/java/com/juick/service/AdsServiceImpl.java index a6a5c85d..a6a5c85d 100644 --- a/server-core/src/main/java/com/juick/service/AdsServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/AdsServiceImpl.java diff --git a/server-core/src/main/java/com/juick/service/BaseJdbcService.java b/juick-server/src/main/java/com/juick/service/BaseJdbcService.java index fe544efe..fe544efe 100644 --- a/server-core/src/main/java/com/juick/service/BaseJdbcService.java +++ b/juick-server/src/main/java/com/juick/service/BaseJdbcService.java diff --git a/server-core/src/main/java/com/juick/service/CrosspostService.java b/juick-server/src/main/java/com/juick/service/CrosspostService.java index 88821b60..88821b60 100644 --- a/server-core/src/main/java/com/juick/service/CrosspostService.java +++ b/juick-server/src/main/java/com/juick/service/CrosspostService.java diff --git a/server-core/src/main/java/com/juick/service/CrosspostServiceImpl.java b/juick-server/src/main/java/com/juick/service/CrosspostServiceImpl.java index ed1cd676..ed1cd676 100644 --- a/server-core/src/main/java/com/juick/service/CrosspostServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/CrosspostServiceImpl.java diff --git a/server-core/src/main/java/com/juick/service/MessagesService.java b/juick-server/src/main/java/com/juick/service/MessagesService.java index 00f97b75..00f97b75 100644 --- a/server-core/src/main/java/com/juick/service/MessagesService.java +++ b/juick-server/src/main/java/com/juick/service/MessagesService.java diff --git a/server-core/src/main/java/com/juick/service/MessagesServiceImpl.java b/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java index bb030ed4..bb030ed4 100644 --- a/server-core/src/main/java/com/juick/service/MessagesServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java diff --git a/server-core/src/main/java/com/juick/service/PMQueriesService.java b/juick-server/src/main/java/com/juick/service/PMQueriesService.java index df332870..df332870 100644 --- a/server-core/src/main/java/com/juick/service/PMQueriesService.java +++ b/juick-server/src/main/java/com/juick/service/PMQueriesService.java diff --git a/server-core/src/main/java/com/juick/service/PMQueriesServiceImpl.java b/juick-server/src/main/java/com/juick/service/PMQueriesServiceImpl.java index 5c28c2ba..5c28c2ba 100644 --- a/server-core/src/main/java/com/juick/service/PMQueriesServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/PMQueriesServiceImpl.java diff --git a/server-core/src/main/java/com/juick/service/PrivacyQueriesService.java b/juick-server/src/main/java/com/juick/service/PrivacyQueriesService.java index 61eb199b..61eb199b 100644 --- a/server-core/src/main/java/com/juick/service/PrivacyQueriesService.java +++ b/juick-server/src/main/java/com/juick/service/PrivacyQueriesService.java diff --git a/server-core/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java b/juick-server/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java index 7dac4073..7dac4073 100644 --- a/server-core/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java diff --git a/server-core/src/main/java/com/juick/service/PushQueriesService.java b/juick-server/src/main/java/com/juick/service/PushQueriesService.java index 8e7ce543..8e7ce543 100644 --- a/server-core/src/main/java/com/juick/service/PushQueriesService.java +++ b/juick-server/src/main/java/com/juick/service/PushQueriesService.java diff --git a/server-core/src/main/java/com/juick/service/PushQueriesServiceImpl.java b/juick-server/src/main/java/com/juick/service/PushQueriesServiceImpl.java index 91861bd9..91861bd9 100644 --- a/server-core/src/main/java/com/juick/service/PushQueriesServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/PushQueriesServiceImpl.java diff --git a/server-core/src/main/java/com/juick/service/ShowQueriesService.java b/juick-server/src/main/java/com/juick/service/ShowQueriesService.java index a7e1c364..a7e1c364 100644 --- a/server-core/src/main/java/com/juick/service/ShowQueriesService.java +++ b/juick-server/src/main/java/com/juick/service/ShowQueriesService.java diff --git a/server-core/src/main/java/com/juick/service/ShowQueriesServiceImpl.java b/juick-server/src/main/java/com/juick/service/ShowQueriesServiceImpl.java index 2ddfeb84..2ddfeb84 100644 --- a/server-core/src/main/java/com/juick/service/ShowQueriesServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/ShowQueriesServiceImpl.java diff --git a/server-core/src/main/java/com/juick/service/SubscriptionService.java b/juick-server/src/main/java/com/juick/service/SubscriptionService.java index 00aee15d..00aee15d 100644 --- a/server-core/src/main/java/com/juick/service/SubscriptionService.java +++ b/juick-server/src/main/java/com/juick/service/SubscriptionService.java diff --git a/server-core/src/main/java/com/juick/service/SubscriptionServiceImpl.java b/juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java index f6ecb658..f6ecb658 100644 --- a/server-core/src/main/java/com/juick/service/SubscriptionServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java diff --git a/server-core/src/main/java/com/juick/service/TagService.java b/juick-server/src/main/java/com/juick/service/TagService.java index d5f63e3a..d5f63e3a 100644 --- a/server-core/src/main/java/com/juick/service/TagService.java +++ b/juick-server/src/main/java/com/juick/service/TagService.java diff --git a/server-core/src/main/java/com/juick/service/TagServiceImpl.java b/juick-server/src/main/java/com/juick/service/TagServiceImpl.java index d63159cf..d63159cf 100644 --- a/server-core/src/main/java/com/juick/service/TagServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/TagServiceImpl.java diff --git a/server-core/src/main/java/com/juick/service/UserService.java b/juick-server/src/main/java/com/juick/service/UserService.java index e970afb7..e970afb7 100644 --- a/server-core/src/main/java/com/juick/service/UserService.java +++ b/juick-server/src/main/java/com/juick/service/UserService.java diff --git a/server-core/src/main/java/com/juick/service/UserServiceImpl.java b/juick-server/src/main/java/com/juick/service/UserServiceImpl.java index 63785cff..63785cff 100644 --- a/server-core/src/main/java/com/juick/service/UserServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/UserServiceImpl.java diff --git a/server-core/src/main/java/com/juick/util/TagUtils.java b/juick-server/src/main/java/com/juick/util/TagUtils.java index 157522ab..157522ab 100644 --- a/server-core/src/main/java/com/juick/util/TagUtils.java +++ b/juick-server/src/main/java/com/juick/util/TagUtils.java diff --git a/server-core/src/main/java/com/juick/util/ThreadHelper.java b/juick-server/src/main/java/com/juick/util/ThreadHelper.java index 64a56f7c..64a56f7c 100644 --- a/server-core/src/main/java/com/juick/util/ThreadHelper.java +++ b/juick-server/src/main/java/com/juick/util/ThreadHelper.java diff --git a/server-core/src/main/java/com/juick/util/UserUtils.java b/juick-server/src/main/java/com/juick/util/UserUtils.java index 611a3b15..611a3b15 100644 --- a/server-core/src/main/java/com/juick/util/UserUtils.java +++ b/juick-server/src/main/java/com/juick/util/UserUtils.java diff --git a/server-core/src/main/resources/juick.conf.example b/juick-server/src/main/resources/juick.conf.example index c9411456..c9411456 100644 --- a/server-core/src/main/resources/juick.conf.example +++ b/juick-server/src/main/resources/juick.conf.example diff --git a/server-core/src/main/resources/logback.xml.example b/juick-server/src/main/resources/logback.xml.example index 05a3cfdf..05a3cfdf 100644 --- a/server-core/src/main/resources/logback.xml.example +++ b/juick-server/src/main/resources/logback.xml.example diff --git a/server-core/src/main/resources/schema.sql b/juick-server/src/main/resources/schema.sql index 90bb4ed4..90bb4ed4 100644 --- a/server-core/src/main/resources/schema.sql +++ b/juick-server/src/main/resources/schema.sql diff --git a/juick-ws/build.gradle b/juick-ws/build.gradle index 4148b741..c0f62215 100644 --- a/juick-ws/build.gradle +++ b/juick-ws/build.gradle @@ -19,7 +19,7 @@ repositories { def springFrameworkVersion = '4.3.4.RELEASE' dependencies { - compile project(':server-core') + compile project(':juick-server') compile 'org.bitbucket.sco0ter.babbler:xmpp-core-client:279e488e51' compile 'org.bitbucket.sco0ter.babbler:xmpp-extensions-client:279e488e51' compile "org.springframework:spring-webmvc:${springFrameworkVersion}" diff --git a/juick-www/build.gradle b/juick-www/build.gradle index c6c2b637..69813f8d 100644 --- a/juick-www/build.gradle +++ b/juick-www/build.gradle @@ -26,7 +26,7 @@ repositories { def springFrameworkVersion = '4.3.4.RELEASE' dependencies { - compile project(':server-core') + compile project(':juick-server') compile 'org.bitbucket.sco0ter.babbler:xmpp-core-client:279e488e51' compile 'org.bitbucket.sco0ter.babbler:xmpp-extensions-client:279e488e51' compile 'com.github.scribejava:scribejava-apis:3.2.0' diff --git a/juick-xmpp-bot/build.gradle b/juick-xmpp-bot/build.gradle index 5f458fa9..b2a20b0e 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(':server-core') + compile project(':juick-server') 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 5f458fa9..b2a20b0e 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(':server-core') + compile project(':juick-server') 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 892e23cb..cf9af133 100644 --- a/juick-xmpp/build.gradle +++ b/juick-xmpp/build.gradle @@ -13,7 +13,7 @@ def jacksonVersion = '2.8.4' def slf4jVersion = '1.7.21' dependencies { - compile project(':server-core') + compile project(':juick-server') compile 'com.github.juick:com.juick.xmpp:dbf603cfff' compile "org.slf4j:slf4j-api:${slf4jVersion}" compile "org.springframework:spring-webmvc:${springFrameworkVersion}" @@ -8,7 +8,7 @@ mysql -u user -p create database juick; exit -mysql -u user -p < server-core/src/main/resources/schema.sql +mysql -u user -p < juick-server/src/main/resources/schema.sql mysql -u user -p use juick; diff --git a/settings.gradle b/settings.gradle index 2b1e5051..1edde226 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':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' +include ':juick-core', 'juick-server', ':juick-api', ':juick-www', ':juick-rss', ':juick-ws', ':juick-demo', ':juick-notifications', ':juick-crosspost', ':juick-xmpp', ':juick-xmpp-ft', ':juick-xmpp-bot' |