diff options
12 files changed, 21 insertions, 12 deletions
diff --git a/juick-api/src/main/java/com/juick/api/controllers/Messages.java b/juick-api/src/main/java/com/juick/api/controllers/Messages.java index 75d38c92..2ccdcf9a 100644 --- a/juick-api/src/main/java/com/juick/api/controllers/Messages.java +++ b/juick-api/src/main/java/com/juick/api/controllers/Messages.java @@ -3,7 +3,7 @@ package com.juick.api.controllers; import com.juick.Tag; import com.juick.User; import com.juick.api.ApiServer; -import com.juick.server.helpers.Status; +import com.juick.Status; import com.juick.server.util.HttpBadRequestException; import com.juick.server.util.HttpForbiddenException; import com.juick.service.MessagesService; diff --git a/juick-api/src/main/java/com/juick/api/controllers/Notifications.java b/juick-api/src/main/java/com/juick/api/controllers/Notifications.java index 24cb67f3..48db64be 100644 --- a/juick-api/src/main/java/com/juick/api/controllers/Notifications.java +++ b/juick-api/src/main/java/com/juick/api/controllers/Notifications.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.juick.Message; import com.juick.User; -import com.juick.server.helpers.Status; -import com.juick.server.helpers.TokensList; +import com.juick.Status; +import com.juick.TokensList; import com.juick.server.util.HttpBadRequestException; import com.juick.server.util.HttpForbiddenException; import com.juick.service.MessagesService; diff --git a/juick-server/src/main/java/com/juick/server/helpers/Status.java b/juick-core/src/main/java/com/juick/Status.java index 3c344193..794f1c9e 100644 --- a/juick-server/src/main/java/com/juick/server/helpers/Status.java +++ b/juick-core/src/main/java/com/juick/Status.java @@ -1,4 +1,4 @@ -package com.juick.server.helpers; +package com.juick; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/juick-server/src/main/java/com/juick/server/helpers/TokensList.java b/juick-core/src/main/java/com/juick/TokensList.java index cb331e04..de5158c7 100644 --- a/juick-server/src/main/java/com/juick/server/helpers/TokensList.java +++ b/juick-core/src/main/java/com/juick/TokensList.java @@ -1,4 +1,4 @@ -package com.juick.server.helpers; +package com.juick; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java b/juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java index 589a6145..d6f5331a 100644 --- a/juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java +++ b/juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java @@ -1,7 +1,7 @@ package com.juick.components.controllers; import com.juick.components.Crosspost; -import com.juick.server.helpers.Status; +import com.juick.Status; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/juick-notifications/build.gradle b/juick-notifications/build.gradle index 1e81e6fc..e7806c00 100644 --- a/juick-notifications/build.gradle +++ b/juick-notifications/build.gradle @@ -12,6 +12,15 @@ dependencies { compile "javax.inject:javax.inject:1" + compile "ch.qos.logback:logback-classic:${rootProject.logbackVersion}" + compile "ch.qos.logback:logback-core:${rootProject.logbackVersion}" + compile "ch.qos.logback:logback-access:${rootProject.logbackVersion}" + + compile "org.slf4j:slf4j-api:${rootProject.slf4jVersion}" + compile "org.slf4j:jcl-over-slf4j:${rootProject.slf4jVersion}" + compile "org.slf4j:log4j-over-slf4j:${rootProject.slf4jVersion}" + compile "org.slf4j:jul-to-slf4j:${rootProject.slf4jVersion}" + compile "org.apache.httpcomponents:httpclient:4.5.2" compile "org.apache.commons:commons-lang3:3.5" compile "org.bitbucket.sco0ter.babbler:xmpp-core-client:0ba6c0e2f9" diff --git a/juick-notifications/src/main/java/com/juick/components/CleanUp.java b/juick-notifications/src/main/java/com/juick/components/CleanUp.java index 924d6134..c78b3f77 100644 --- a/juick-notifications/src/main/java/com/juick/components/CleanUp.java +++ b/juick-notifications/src/main/java/com/juick/components/CleanUp.java @@ -1,6 +1,6 @@ package com.juick.components; -import com.juick.server.helpers.TokensList; +import com.juick.TokensList; import com.notnoop.apns.ApnsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juick-notifications/src/main/java/com/juick/components/controllers/StatusController.java b/juick-notifications/src/main/java/com/juick/components/controllers/StatusController.java index d05b3ecc..76435ef9 100644 --- a/juick-notifications/src/main/java/com/juick/components/controllers/StatusController.java +++ b/juick-notifications/src/main/java/com/juick/components/controllers/StatusController.java @@ -1,7 +1,7 @@ package com.juick.components.controllers; +import com.juick.Status; import com.juick.components.Notifications; -import com.juick.server.helpers.Status; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/juick-ws/src/main/java/com/juick/ws/controllers/ApiController.java b/juick-ws/src/main/java/com/juick/ws/controllers/ApiController.java index 21572637..70b324dd 100644 --- a/juick-ws/src/main/java/com/juick/ws/controllers/ApiController.java +++ b/juick-ws/src/main/java/com/juick/ws/controllers/ApiController.java @@ -1,6 +1,6 @@ package com.juick.ws.controllers; -import com.juick.server.helpers.Status; +import com.juick.Status; import com.juick.ws.WebsocketComponent; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/juick-xmpp-bot/src/main/java/com/juick/components/controllers/StatusController.java b/juick-xmpp-bot/src/main/java/com/juick/components/controllers/StatusController.java index cbd49009..53963d38 100644 --- a/juick-xmpp-bot/src/main/java/com/juick/components/controllers/StatusController.java +++ b/juick-xmpp-bot/src/main/java/com/juick/components/controllers/StatusController.java @@ -1,7 +1,7 @@ package com.juick.components.controllers; import com.juick.components.XMPPBot; -import com.juick.server.helpers.Status; +import com.juick.Status; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/juick-xmpp-ft/src/main/java/com/juick/components/controllers/StatusController.java b/juick-xmpp-ft/src/main/java/com/juick/components/controllers/StatusController.java index c89c1cfe..eeff36f8 100644 --- a/juick-xmpp-ft/src/main/java/com/juick/components/controllers/StatusController.java +++ b/juick-xmpp-ft/src/main/java/com/juick/components/controllers/StatusController.java @@ -1,7 +1,7 @@ package com.juick.components.controllers; import com.juick.components.XMPPFTServer; -import com.juick.server.helpers.Status; +import com.juick.Status; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/juick-xmpp/src/main/java/com/juick/components/controllers/StatusController.java b/juick-xmpp/src/main/java/com/juick/components/controllers/StatusController.java index afe566d8..68168c16 100644 --- a/juick-xmpp/src/main/java/com/juick/components/controllers/StatusController.java +++ b/juick-xmpp/src/main/java/com/juick/components/controllers/StatusController.java @@ -1,7 +1,7 @@ package com.juick.components.controllers; import com.juick.components.XMPPServer; -import com.juick.server.helpers.Status; +import com.juick.Status; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; |