diff options
-rw-r--r-- | juick-core/build.gradle | 15 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/Group.java (renamed from src/main/java/com/juick/Group.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/Message.java (renamed from src/main/java/com/juick/Message.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/PM.java (renamed from src/main/java/com/juick/PM.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/Place.java (renamed from src/main/java/com/juick/Place.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/Recommendation.java (renamed from src/main/java/com/juick/Recommendation.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/Tag.java (renamed from src/main/java/com/juick/Tag.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/User.java (renamed from src/main/java/com/juick/User.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/json/JSONSerializer.java (renamed from src/main/java/com/juick/json/JSONSerializer.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/json/MessageSerializer.java (renamed from src/main/java/com/juick/json/MessageSerializer.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/json/PlaceSerializer.java (renamed from src/main/java/com/juick/json/PlaceSerializer.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/json/UserSerializer.java (renamed from src/main/java/com/juick/json/UserSerializer.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/server/AdsQueries.java (renamed from src/main/java/com/juick/server/AdsQueries.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/server/CrosspostQueries.java (renamed from src/main/java/com/juick/server/CrosspostQueries.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/server/MessagesQueries.java (renamed from src/main/java/com/juick/server/MessagesQueries.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/server/PMQueries.java (renamed from src/main/java/com/juick/server/PMQueries.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/server/PushQueries.java (renamed from src/main/java/com/juick/server/PushQueries.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/server/SQLHelpers.java (renamed from src/main/java/com/juick/server/SQLHelpers.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/server/ShowQueries.java (renamed from src/main/java/com/juick/server/ShowQueries.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/server/SubscriptionsQueries.java (renamed from src/main/java/com/juick/server/SubscriptionsQueries.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/server/TagQueries.java (renamed from src/main/java/com/juick/server/TagQueries.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/server/UserQueries.java (renamed from src/main/java/com/juick/server/UserQueries.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/server/Utils.java (renamed from src/main/java/com/juick/server/Utils.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java (renamed from src/main/java/com/juick/server/helpers/PrivacyOpts.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/xmpp/extensions/JuickMessage.java (renamed from src/main/java/com/juick/xmpp/extensions/JuickMessage.java) | 0 | ||||
-rw-r--r-- | juick-core/src/main/java/com/juick/xmpp/extensions/JuickUser.java (renamed from src/main/java/com/juick/xmpp/extensions/JuickUser.java) | 0 | ||||
-rw-r--r-- | juick-www/build.gradle (renamed from build.gradle) | 8 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/server/protocol/JuickProtocol.java (renamed from src/main/java/com/juick/server/protocol/JuickProtocol.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/server/protocol/ProtocolReply.java (renamed from src/main/java/com/juick/server/protocol/ProtocolReply.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/server/protocol/annotation/UserCommand.java (renamed from src/main/java/com/juick/server/protocol/annotation/UserCommand.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/CrosspostComponent.java (renamed from src/main/java/com/juick/CrosspostComponent.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/Discover.java (renamed from src/main/java/com/juick/http/www/Discover.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/Errors.java (renamed from src/main/java/com/juick/http/www/Errors.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/FacebookLogin.java (renamed from src/main/java/com/juick/http/www/FacebookLogin.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/Help.java (renamed from src/main/java/com/juick/http/www/Help.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/Home.java (renamed from src/main/java/com/juick/http/www/Home.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/Login.java (renamed from src/main/java/com/juick/http/www/Login.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/Main.java (renamed from src/main/java/com/juick/http/www/Main.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/NewMessage.java (renamed from src/main/java/com/juick/http/www/NewMessage.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/PM.java (renamed from src/main/java/com/juick/http/www/PM.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/PageTemplates.java (renamed from src/main/java/com/juick/http/www/PageTemplates.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/PushComponent.java (renamed from src/main/java/com/juick/PushComponent.java) | 10 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/RSS.java (renamed from src/main/java/com/juick/http/www/RSS.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/Settings.java (renamed from src/main/java/com/juick/http/www/Settings.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/SignUp.java (renamed from src/main/java/com/juick/http/www/SignUp.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/TwitterAuth.java (renamed from src/main/java/com/juick/http/www/TwitterAuth.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/User.java (renamed from src/main/java/com/juick/http/www/User.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/UserThread.java (renamed from src/main/java/com/juick/http/www/UserThread.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/Utils.java (renamed from src/main/java/com/juick/http/www/Utils.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/VKontakteLogin.java (renamed from src/main/java/com/juick/http/www/VKontakteLogin.java) | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/xmpp/s2s/CacheEntry.java (renamed from src/main/java/com/juick/xmpp/s2s/CacheEntry.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/xmpp/s2s/CleaningUp.java (renamed from src/main/java/com/juick/xmpp/s2s/CleaningUp.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/xmpp/s2s/Connection.java (renamed from src/main/java/com/juick/xmpp/s2s/Connection.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java (renamed from src/main/java/com/juick/xmpp/s2s/ConnectionIn.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java (renamed from src/main/java/com/juick/xmpp/s2s/ConnectionOut.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/xmpp/s2s/DNSQueries.java (renamed from src/main/java/com/juick/xmpp/s2s/DNSQueries.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/xmpp/s2s/JuickBot.java (renamed from src/main/java/com/juick/xmpp/s2s/JuickBot.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/xmpp/s2s/XMPPComponent.java (renamed from src/main/java/com/juick/xmpp/s2s/XMPPComponent.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/ru/sape/Sape.java (renamed from src/main/java/ru/sape/Sape.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/ru/sape/SapeConnection.java (renamed from src/main/java/ru/sape/SapeConnection.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/ru/sape/SapePageLinks.java (renamed from src/main/java/ru/sape/SapePageLinks.java) | 0 | ||||
-rw-r--r-- | juick-www/src/main/java/ru/sape/SerializedPhpParser.java (renamed from src/main/java/ru/sape/SerializedPhpParser.java) | 0 | ||||
-rw-r--r-- | juick-www/src/webapp/WEB-INF/juick.conf.example (renamed from src/main/webapp/WEB-INF/juick.conf.example) | 8 | ||||
-rw-r--r-- | juick-www/src/webapp/WEB-INF/logging.properties.example (renamed from src/main/webapp/WEB-INF/logging.properties.example) | 0 | ||||
-rw-r--r-- | juick-www/src/webapp/WEB-INF/web.xml (renamed from src/main/webapp/WEB-INF/web.xml) | 6 | ||||
-rw-r--r-- | juick-www/src/webapp/favicon.png (renamed from src/main/webapp/favicon.png) | bin | 244 -> 244 bytes | |||
-rw-r--r-- | juick-www/src/webapp/logo.png (renamed from src/main/webapp/logo.png) | bin | 1184 -> 1184 bytes | |||
-rw-r--r-- | juick-www/src/webapp/scripts.js (renamed from src/main/webapp/scripts.js) | 0 | ||||
-rw-r--r-- | juick-www/src/webapp/style.css (renamed from src/main/webapp/style.css) | 0 | ||||
-rw-r--r-- | settings.gradle | 2 |
70 files changed, 48 insertions, 39 deletions
diff --git a/juick-core/build.gradle b/juick-core/build.gradle new file mode 100644 index 00000000..bb10c52b --- /dev/null +++ b/juick-core/build.gradle @@ -0,0 +1,15 @@ +apply plugin: 'java' + +repositories { + mavenCentral() +} + +dependencies { + compile project(':deps:com.juick.xmpp') + compile 'org.apache.httpcomponents:httpclient:4.5.1' + compile 'org.apache.commons:commons-lang3:3.4' + compile "org.springframework:spring-jdbc:4.3.1.RELEASE" + compile 'org.json:json:20151123' +} + +compileJava.options.encoding = 'UTF-8'
\ No newline at end of file diff --git a/src/main/java/com/juick/Group.java b/juick-core/src/main/java/com/juick/Group.java index 008d3af2..008d3af2 100644 --- a/src/main/java/com/juick/Group.java +++ b/juick-core/src/main/java/com/juick/Group.java diff --git a/src/main/java/com/juick/Message.java b/juick-core/src/main/java/com/juick/Message.java index c128b4f2..c128b4f2 100644 --- a/src/main/java/com/juick/Message.java +++ b/juick-core/src/main/java/com/juick/Message.java diff --git a/src/main/java/com/juick/PM.java b/juick-core/src/main/java/com/juick/PM.java index 658cafc9..658cafc9 100644 --- a/src/main/java/com/juick/PM.java +++ b/juick-core/src/main/java/com/juick/PM.java diff --git a/src/main/java/com/juick/Place.java b/juick-core/src/main/java/com/juick/Place.java index 7174ed6e..7174ed6e 100644 --- a/src/main/java/com/juick/Place.java +++ b/juick-core/src/main/java/com/juick/Place.java diff --git a/src/main/java/com/juick/Recommendation.java b/juick-core/src/main/java/com/juick/Recommendation.java index 4cfa67c2..4cfa67c2 100644 --- a/src/main/java/com/juick/Recommendation.java +++ b/juick-core/src/main/java/com/juick/Recommendation.java diff --git a/src/main/java/com/juick/Tag.java b/juick-core/src/main/java/com/juick/Tag.java index 119aad99..119aad99 100644 --- a/src/main/java/com/juick/Tag.java +++ b/juick-core/src/main/java/com/juick/Tag.java diff --git a/src/main/java/com/juick/User.java b/juick-core/src/main/java/com/juick/User.java index b9111d8f..b9111d8f 100644 --- a/src/main/java/com/juick/User.java +++ b/juick-core/src/main/java/com/juick/User.java diff --git a/src/main/java/com/juick/json/JSONSerializer.java b/juick-core/src/main/java/com/juick/json/JSONSerializer.java index 142cacf0..142cacf0 100644 --- a/src/main/java/com/juick/json/JSONSerializer.java +++ b/juick-core/src/main/java/com/juick/json/JSONSerializer.java diff --git a/src/main/java/com/juick/json/MessageSerializer.java b/juick-core/src/main/java/com/juick/json/MessageSerializer.java index e8402d51..e8402d51 100644 --- a/src/main/java/com/juick/json/MessageSerializer.java +++ b/juick-core/src/main/java/com/juick/json/MessageSerializer.java diff --git a/src/main/java/com/juick/json/PlaceSerializer.java b/juick-core/src/main/java/com/juick/json/PlaceSerializer.java index f433f7f0..f433f7f0 100644 --- a/src/main/java/com/juick/json/PlaceSerializer.java +++ b/juick-core/src/main/java/com/juick/json/PlaceSerializer.java diff --git a/src/main/java/com/juick/json/UserSerializer.java b/juick-core/src/main/java/com/juick/json/UserSerializer.java index 390f4bf6..390f4bf6 100644 --- a/src/main/java/com/juick/json/UserSerializer.java +++ b/juick-core/src/main/java/com/juick/json/UserSerializer.java diff --git a/src/main/java/com/juick/server/AdsQueries.java b/juick-core/src/main/java/com/juick/server/AdsQueries.java index 06590817..06590817 100644 --- a/src/main/java/com/juick/server/AdsQueries.java +++ b/juick-core/src/main/java/com/juick/server/AdsQueries.java diff --git a/src/main/java/com/juick/server/CrosspostQueries.java b/juick-core/src/main/java/com/juick/server/CrosspostQueries.java index 04898d0a..04898d0a 100644 --- a/src/main/java/com/juick/server/CrosspostQueries.java +++ b/juick-core/src/main/java/com/juick/server/CrosspostQueries.java diff --git a/src/main/java/com/juick/server/MessagesQueries.java b/juick-core/src/main/java/com/juick/server/MessagesQueries.java index a0242543..a0242543 100644 --- a/src/main/java/com/juick/server/MessagesQueries.java +++ b/juick-core/src/main/java/com/juick/server/MessagesQueries.java diff --git a/src/main/java/com/juick/server/PMQueries.java b/juick-core/src/main/java/com/juick/server/PMQueries.java index 74d5df3e..74d5df3e 100644 --- a/src/main/java/com/juick/server/PMQueries.java +++ b/juick-core/src/main/java/com/juick/server/PMQueries.java diff --git a/src/main/java/com/juick/server/PushQueries.java b/juick-core/src/main/java/com/juick/server/PushQueries.java index 54528993..54528993 100644 --- a/src/main/java/com/juick/server/PushQueries.java +++ b/juick-core/src/main/java/com/juick/server/PushQueries.java diff --git a/src/main/java/com/juick/server/SQLHelpers.java b/juick-core/src/main/java/com/juick/server/SQLHelpers.java index 13ebe98a..13ebe98a 100644 --- a/src/main/java/com/juick/server/SQLHelpers.java +++ b/juick-core/src/main/java/com/juick/server/SQLHelpers.java diff --git a/src/main/java/com/juick/server/ShowQueries.java b/juick-core/src/main/java/com/juick/server/ShowQueries.java index 3ddff412..3ddff412 100644 --- a/src/main/java/com/juick/server/ShowQueries.java +++ b/juick-core/src/main/java/com/juick/server/ShowQueries.java diff --git a/src/main/java/com/juick/server/SubscriptionsQueries.java b/juick-core/src/main/java/com/juick/server/SubscriptionsQueries.java index 7c30285b..7c30285b 100644 --- a/src/main/java/com/juick/server/SubscriptionsQueries.java +++ b/juick-core/src/main/java/com/juick/server/SubscriptionsQueries.java diff --git a/src/main/java/com/juick/server/TagQueries.java b/juick-core/src/main/java/com/juick/server/TagQueries.java index 2258a8ea..2258a8ea 100644 --- a/src/main/java/com/juick/server/TagQueries.java +++ b/juick-core/src/main/java/com/juick/server/TagQueries.java diff --git a/src/main/java/com/juick/server/UserQueries.java b/juick-core/src/main/java/com/juick/server/UserQueries.java index db380d7a..db380d7a 100644 --- a/src/main/java/com/juick/server/UserQueries.java +++ b/juick-core/src/main/java/com/juick/server/UserQueries.java diff --git a/src/main/java/com/juick/server/Utils.java b/juick-core/src/main/java/com/juick/server/Utils.java index 1968150e..1968150e 100644 --- a/src/main/java/com/juick/server/Utils.java +++ b/juick-core/src/main/java/com/juick/server/Utils.java diff --git a/src/main/java/com/juick/server/helpers/PrivacyOpts.java b/juick-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java index 66cf9410..66cf9410 100644 --- a/src/main/java/com/juick/server/helpers/PrivacyOpts.java +++ b/juick-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java diff --git a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java b/juick-core/src/main/java/com/juick/xmpp/extensions/JuickMessage.java index 885b2375..885b2375 100644 --- a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java +++ b/juick-core/src/main/java/com/juick/xmpp/extensions/JuickMessage.java diff --git a/src/main/java/com/juick/xmpp/extensions/JuickUser.java b/juick-core/src/main/java/com/juick/xmpp/extensions/JuickUser.java index edc6749a..edc6749a 100644 --- a/src/main/java/com/juick/xmpp/extensions/JuickUser.java +++ b/juick-core/src/main/java/com/juick/xmpp/extensions/JuickUser.java diff --git a/build.gradle b/juick-www/build.gradle index d23b241a..c71b682f 100644 --- a/build.gradle +++ b/juick-www/build.gradle @@ -1,10 +1,3 @@ -subprojects { - apply plugin: 'java' - repositories { - mavenCentral() - } -} - buildscript { repositories { mavenCentral() @@ -29,6 +22,7 @@ repositories { } dependencies { + compile project(':juick-core') compile project(':deps:com.juick.xmpp') compile 'org.slf4j:slf4j-jdk14:1.7.13' compile 'com.ganyo:gcm-server:1.0.+' diff --git a/src/main/java/com/juick/server/protocol/JuickProtocol.java b/juick-www/src/main/java/com/juick/server/protocol/JuickProtocol.java index 1a2e5333..1a2e5333 100644 --- a/src/main/java/com/juick/server/protocol/JuickProtocol.java +++ b/juick-www/src/main/java/com/juick/server/protocol/JuickProtocol.java diff --git a/src/main/java/com/juick/server/protocol/ProtocolReply.java b/juick-www/src/main/java/com/juick/server/protocol/ProtocolReply.java index d9d36a5d..d9d36a5d 100644 --- a/src/main/java/com/juick/server/protocol/ProtocolReply.java +++ b/juick-www/src/main/java/com/juick/server/protocol/ProtocolReply.java diff --git a/src/main/java/com/juick/server/protocol/annotation/UserCommand.java b/juick-www/src/main/java/com/juick/server/protocol/annotation/UserCommand.java index af7c4924..af7c4924 100644 --- a/src/main/java/com/juick/server/protocol/annotation/UserCommand.java +++ b/juick-www/src/main/java/com/juick/server/protocol/annotation/UserCommand.java diff --git a/src/main/java/com/juick/CrosspostComponent.java b/juick-www/src/main/java/com/juick/www/CrosspostComponent.java index 8b07583f..e2ddbfa5 100644 --- a/src/main/java/com/juick/CrosspostComponent.java +++ b/juick-www/src/main/java/com/juick/www/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; +package com.juick.www; import com.juick.server.CrosspostQueries; import com.juick.xmpp.JID; diff --git a/src/main/java/com/juick/http/www/Discover.java b/juick-www/src/main/java/com/juick/www/Discover.java index 4ae3156b..238af0fb 100644 --- a/src/main/java/com/juick/http/www/Discover.java +++ b/juick-www/src/main/java/com/juick/www/Discover.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.http.www; +package com.juick.www; import com.juick.server.AdsQueries; import com.juick.server.MessagesQueries; diff --git a/src/main/java/com/juick/http/www/Errors.java b/juick-www/src/main/java/com/juick/www/Errors.java index 0044c209..45fa3d51 100644 --- a/src/main/java/com/juick/http/www/Errors.java +++ b/juick-www/src/main/java/com/juick/www/Errors.java @@ -1,4 +1,4 @@ -package com.juick.http.www; +package com.juick.www; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/juick/http/www/FacebookLogin.java b/juick-www/src/main/java/com/juick/www/FacebookLogin.java index cf444abc..22b081a5 100644 --- a/src/main/java/com/juick/http/www/FacebookLogin.java +++ b/juick-www/src/main/java/com/juick/www/FacebookLogin.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.http.www; +package com.juick.www; import com.juick.server.UserQueries; import org.json.JSONObject; diff --git a/src/main/java/com/juick/http/www/Help.java b/juick-www/src/main/java/com/juick/www/Help.java index 761c6ce1..e0ecab2b 100644 --- a/src/main/java/com/juick/http/www/Help.java +++ b/juick-www/src/main/java/com/juick/www/Help.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.http.www; +package com.juick.www; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/juick/http/www/Home.java b/juick-www/src/main/java/com/juick/www/Home.java index 1c7cdc30..9241c5e6 100644 --- a/src/main/java/com/juick/http/www/Home.java +++ b/juick-www/src/main/java/com/juick/www/Home.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.http.www; +package com.juick.www; import com.juick.server.AdsQueries; import com.juick.server.MessagesQueries; diff --git a/src/main/java/com/juick/http/www/Login.java b/juick-www/src/main/java/com/juick/www/Login.java index f12c7096..155f58d5 100644 --- a/src/main/java/com/juick/http/www/Login.java +++ b/juick-www/src/main/java/com/juick/www/Login.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.http.www; +package com.juick.www; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/juick/http/www/Main.java b/juick-www/src/main/java/com/juick/www/Main.java index ebdda1c9..8602447a 100644 --- a/src/main/java/com/juick/http/www/Main.java +++ b/juick-www/src/main/java/com/juick/www/Main.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.http.www; +package com.juick.www; import com.juick.server.UserQueries; import com.juick.xmpp.JID; diff --git a/src/main/java/com/juick/http/www/NewMessage.java b/juick-www/src/main/java/com/juick/www/NewMessage.java index 642bd794..dc1b25f7 100644 --- a/src/main/java/com/juick/http/www/NewMessage.java +++ b/juick-www/src/main/java/com/juick/www/NewMessage.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.http.www; +package com.juick.www; import com.juick.Tag; import com.juick.server.*; diff --git a/src/main/java/com/juick/http/www/PM.java b/juick-www/src/main/java/com/juick/www/PM.java index 932d1baf..5adef7b3 100644 --- a/src/main/java/com/juick/http/www/PM.java +++ b/juick-www/src/main/java/com/juick/www/PM.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.http.www; +package com.juick.www; import com.juick.server.PMQueries; import com.juick.server.UserQueries; diff --git a/src/main/java/com/juick/http/www/PageTemplates.java b/juick-www/src/main/java/com/juick/www/PageTemplates.java index da5659e9..f2483ac0 100644 --- a/src/main/java/com/juick/http/www/PageTemplates.java +++ b/juick-www/src/main/java/com/juick/www/PageTemplates.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.http.www; +package com.juick.www; import com.juick.Message; import com.juick.Tag; diff --git a/src/main/java/com/juick/PushComponent.java b/juick-www/src/main/java/com/juick/www/PushComponent.java index 3bb7cdc5..67366628 100644 --- a/src/main/java/com/juick/PushComponent.java +++ b/juick-www/src/main/java/com/juick/www/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; +package com.juick.www; import com.google.android.gcm.server.Message; import com.google.android.gcm.server.MulticastResult; @@ -139,7 +139,7 @@ public class PushComponent implements ServletContextListener, Stream.StreamListe @Override public void onMessage(com.juick.xmpp.Message msg) { JuickMessage jmsg = (JuickMessage)msg.getChild(JuickMessage.XMLNS); - List<User> subscribedUsers = new ArrayList<>(); + List<com.juick.User> subscribedUsers = new ArrayList<>(); boolean isPM = jmsg.getMID() == 0; boolean isReply = jmsg.getRID() > 0; int pmTo = 0; @@ -160,7 +160,7 @@ public class PushComponent implements ServletContextListener, Stream.StreamListe if (isPM) { PushQueries.getAndroidRegID(sql, pmTo).ifPresent(regids::add); } else { - List<Integer> uids = subscribedUsers.stream().map(User::getUID).collect(Collectors.toList()); + List<Integer> uids = subscribedUsers.stream().map(com.juick.User::getUID).collect(Collectors.toList()); if (uids.size() > 0) { regids.addAll(PushQueries.getAndroidTokens(sql, uids)); } @@ -191,7 +191,7 @@ public class PushComponent implements ServletContextListener, Stream.StreamListe if (isPM) { PushQueries.getWinPhoneURL(sql, pmTo).ifPresent(urls::add); } else { - List<Integer> uids = subscribedUsers.stream().map(User::getUID).collect(Collectors.toList()); + List<Integer> uids = subscribedUsers.stream().map(com.juick.User::getUID).collect(Collectors.toList()); if (uids.size() > 0) { urls.addAll(PushQueries.getWindowsTokens(sql, uids)); } @@ -236,7 +236,7 @@ public class PushComponent implements ServletContextListener, Stream.StreamListe if (isPM) { PushQueries.getAPNSToken(sql, pmTo).ifPresent(tokens::add); } else { - List<Integer> uids = subscribedUsers.stream().map(User::getUID).collect(Collectors.toList()); + List<Integer> uids = subscribedUsers.stream().map(com.juick.User::getUID).collect(Collectors.toList()); if (uids.size() > 0) { tokens.addAll(PushQueries.getAPNSTokens(sql, uids)); } diff --git a/src/main/java/com/juick/http/www/RSS.java b/juick-www/src/main/java/com/juick/www/RSS.java index 349743b5..48510ce3 100644 --- a/src/main/java/com/juick/http/www/RSS.java +++ b/juick-www/src/main/java/com/juick/www/RSS.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.http.www; +package com.juick.www; import com.juick.Message; import com.juick.server.MessagesQueries; diff --git a/src/main/java/com/juick/http/www/Settings.java b/juick-www/src/main/java/com/juick/www/Settings.java index 54ee0ee9..af1591bf 100644 --- a/src/main/java/com/juick/http/www/Settings.java +++ b/juick-www/src/main/java/com/juick/www/Settings.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.http.www; +package com.juick.www; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/juick/http/www/SignUp.java b/juick-www/src/main/java/com/juick/www/SignUp.java index 1ee23386..bba1d34e 100644 --- a/src/main/java/com/juick/http/www/SignUp.java +++ b/juick-www/src/main/java/com/juick/www/SignUp.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.http.www; +package com.juick.www; import com.juick.server.UserQueries; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/com/juick/http/www/TwitterAuth.java b/juick-www/src/main/java/com/juick/www/TwitterAuth.java index cc586740..d4be4335 100644 --- a/src/main/java/com/juick/http/www/TwitterAuth.java +++ b/juick-www/src/main/java/com/juick/www/TwitterAuth.java @@ -1,4 +1,4 @@ -package com.juick.http.www; +package com.juick.www; import com.github.scribejava.apis.TwitterApi; import com.github.scribejava.core.builder.ServiceBuilder; diff --git a/src/main/java/com/juick/http/www/User.java b/juick-www/src/main/java/com/juick/www/User.java index b8441560..549e38af 100644 --- a/src/main/java/com/juick/http/www/User.java +++ b/juick-www/src/main/java/com/juick/www/User.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.http.www; +package com.juick.www; import com.juick.Tag; import com.juick.server.MessagesQueries; diff --git a/src/main/java/com/juick/http/www/UserThread.java b/juick-www/src/main/java/com/juick/www/UserThread.java index 638e3a3b..249cf342 100644 --- a/src/main/java/com/juick/http/www/UserThread.java +++ b/juick-www/src/main/java/com/juick/www/UserThread.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.http.www; +package com.juick.www; import com.juick.Message; import com.juick.Tag; diff --git a/src/main/java/com/juick/http/www/Utils.java b/juick-www/src/main/java/com/juick/www/Utils.java index 44b085b1..c98bddf9 100644 --- a/src/main/java/com/juick/http/www/Utils.java +++ b/juick-www/src/main/java/com/juick/www/Utils.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.http.www; +package com.juick.www; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/juick/http/www/VKontakteLogin.java b/juick-www/src/main/java/com/juick/www/VKontakteLogin.java index 8fad3b7a..509187a9 100644 --- a/src/main/java/com/juick/http/www/VKontakteLogin.java +++ b/juick-www/src/main/java/com/juick/www/VKontakteLogin.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.http.www; +package com.juick.www; import com.juick.server.UserQueries; import org.json.JSONException; diff --git a/src/main/java/com/juick/xmpp/s2s/CacheEntry.java b/juick-www/src/main/java/com/juick/xmpp/s2s/CacheEntry.java index 7cdb18ab..7cdb18ab 100644 --- a/src/main/java/com/juick/xmpp/s2s/CacheEntry.java +++ b/juick-www/src/main/java/com/juick/xmpp/s2s/CacheEntry.java diff --git a/src/main/java/com/juick/xmpp/s2s/CleaningUp.java b/juick-www/src/main/java/com/juick/xmpp/s2s/CleaningUp.java index 14d97ed8..14d97ed8 100644 --- a/src/main/java/com/juick/xmpp/s2s/CleaningUp.java +++ b/juick-www/src/main/java/com/juick/xmpp/s2s/CleaningUp.java diff --git a/src/main/java/com/juick/xmpp/s2s/Connection.java b/juick-www/src/main/java/com/juick/xmpp/s2s/Connection.java index eae6efaa..eae6efaa 100644 --- a/src/main/java/com/juick/xmpp/s2s/Connection.java +++ b/juick-www/src/main/java/com/juick/xmpp/s2s/Connection.java diff --git a/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java b/juick-www/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java index 345caea9..345caea9 100644 --- a/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java +++ b/juick-www/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java diff --git a/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java b/juick-www/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java index e604a5b4..e604a5b4 100644 --- a/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java +++ b/juick-www/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java diff --git a/src/main/java/com/juick/xmpp/s2s/DNSQueries.java b/juick-www/src/main/java/com/juick/xmpp/s2s/DNSQueries.java index e4c5f085..e4c5f085 100644 --- a/src/main/java/com/juick/xmpp/s2s/DNSQueries.java +++ b/juick-www/src/main/java/com/juick/xmpp/s2s/DNSQueries.java diff --git a/src/main/java/com/juick/xmpp/s2s/JuickBot.java b/juick-www/src/main/java/com/juick/xmpp/s2s/JuickBot.java index f0b71689..f0b71689 100644 --- a/src/main/java/com/juick/xmpp/s2s/JuickBot.java +++ b/juick-www/src/main/java/com/juick/xmpp/s2s/JuickBot.java diff --git a/src/main/java/com/juick/xmpp/s2s/XMPPComponent.java b/juick-www/src/main/java/com/juick/xmpp/s2s/XMPPComponent.java index d0b231e2..d0b231e2 100644 --- a/src/main/java/com/juick/xmpp/s2s/XMPPComponent.java +++ b/juick-www/src/main/java/com/juick/xmpp/s2s/XMPPComponent.java diff --git a/src/main/java/ru/sape/Sape.java b/juick-www/src/main/java/ru/sape/Sape.java index c00054ae..c00054ae 100644 --- a/src/main/java/ru/sape/Sape.java +++ b/juick-www/src/main/java/ru/sape/Sape.java diff --git a/src/main/java/ru/sape/SapeConnection.java b/juick-www/src/main/java/ru/sape/SapeConnection.java index 8c794b08..8c794b08 100644 --- a/src/main/java/ru/sape/SapeConnection.java +++ b/juick-www/src/main/java/ru/sape/SapeConnection.java diff --git a/src/main/java/ru/sape/SapePageLinks.java b/juick-www/src/main/java/ru/sape/SapePageLinks.java index 498aeac0..498aeac0 100644 --- a/src/main/java/ru/sape/SapePageLinks.java +++ b/juick-www/src/main/java/ru/sape/SapePageLinks.java diff --git a/src/main/java/ru/sape/SerializedPhpParser.java b/juick-www/src/main/java/ru/sape/SerializedPhpParser.java index a24551b9..a24551b9 100644 --- a/src/main/java/ru/sape/SerializedPhpParser.java +++ b/juick-www/src/main/java/ru/sape/SerializedPhpParser.java diff --git a/src/main/webapp/WEB-INF/juick.conf.example b/juick-www/src/webapp/WEB-INF/juick.conf.example index c0812b61..54ac862a 100644 --- a/src/main/webapp/WEB-INF/juick.conf.example +++ b/juick-www/src/webapp/WEB-INF/juick.conf.example @@ -1,5 +1,5 @@ -mysql_username=username
-xmpp_password=secret
-sape_user=usertoken
-wns_application_sip=ms-app://x-1-11-1-1111111111-...
+mysql_username=username +xmpp_password=secret +sape_user=usertoken +wns_application_sip=ms-app://x-1-11-1-1111111111-... wns_client_secret=secret
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/logging.properties.example b/juick-www/src/webapp/WEB-INF/logging.properties.example index 7bdaa72e..7bdaa72e 100644 --- a/src/main/webapp/WEB-INF/logging.properties.example +++ b/juick-www/src/webapp/WEB-INF/logging.properties.example diff --git a/src/main/webapp/WEB-INF/web.xml b/juick-www/src/webapp/WEB-INF/web.xml index b4fbc03d..4db19af6 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/juick-www/src/webapp/WEB-INF/web.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> <servlet> <servlet-name>Main</servlet-name> - <servlet-class>com.juick.http.www.Main</servlet-class> + <servlet-class>com.juick.www.Main</servlet-class> <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> @@ -35,12 +35,12 @@ <listener> <description>APNS/GCM/MPNS module</description> <display-name>PushComponent</display-name> - <listener-class>com.juick.PushComponent</listener-class> + <listener-class>com.juick.www.PushComponent</listener-class> </listener> <listener> <description>Crossposting module</description> <display-name>CrosspostComponent</display-name> - <listener-class>com.juick.CrosspostComponent</listener-class> + <listener-class>com.juick.www.CrosspostComponent</listener-class> </listener> <listener> <description>XMPP module</description> diff --git a/src/main/webapp/favicon.png b/juick-www/src/webapp/favicon.png Binary files differindex bc7161e2..bc7161e2 100644 --- a/src/main/webapp/favicon.png +++ b/juick-www/src/webapp/favicon.png diff --git a/src/main/webapp/logo.png b/juick-www/src/webapp/logo.png Binary files differindex 933f6099..933f6099 100644 --- a/src/main/webapp/logo.png +++ b/juick-www/src/webapp/logo.png diff --git a/src/main/webapp/scripts.js b/juick-www/src/webapp/scripts.js index 32427e1e..32427e1e 100644 --- a/src/main/webapp/scripts.js +++ b/juick-www/src/webapp/scripts.js diff --git a/src/main/webapp/style.css b/juick-www/src/webapp/style.css index 5548b79a..5548b79a 100644 --- a/src/main/webapp/style.css +++ b/juick-www/src/webapp/style.css diff --git a/settings.gradle b/settings.gradle index 31018a72..96f2c888 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':deps:com.juick.xmpp' +include ':deps:com.juick.xmpp', ':juick-core', 'juick-api', 'juick-www', 'juick-rss', 'juick-ws' |