aboutsummaryrefslogtreecommitdiff
path: root/juick-www
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-06-29 14:03:04 +0300
committerGravatar Vitaly Takmazov2017-06-29 14:03:04 +0300
commit02723131139806c761539a42a5fa80b68ecadee8 (patch)
treeca66f22993908758385f708eb2da4e4aeb20510a /juick-www
parent4cc4b08f4377b7db697abdb533c625da608eb3d3 (diff)
project structure: split server into jdbc + web
Diffstat (limited to 'juick-www')
-rw-r--r--juick-www/build.gradle5
-rw-r--r--juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java4
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/Help.java2
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/Home.java4
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/Login.java2
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/NewMessage.java2
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/PM.java5
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/Settings.java7
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/SignUp.java2
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/Tags.java2
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/User.java2
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/UserThread.java2
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/XMPPPost.java2
13 files changed, 21 insertions, 20 deletions
diff --git a/juick-www/build.gradle b/juick-www/build.gradle
index 5a11e9e2..4c26f754 100644
--- a/juick-www/build.gradle
+++ b/juick-www/build.gradle
@@ -18,7 +18,8 @@ apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty'
dependencies {
- compile project(':juick-server')
+ compile project(':juick-server-web')
+ compile project(':juick-server-jdbc')
compile 'com.github.scribejava:scribejava-apis:4.1.1'
compile 'com.github.ooxi:serialized-php-parser:0.5.0'
compile 'com.sun.mail:javax.mail:1.5.6'
@@ -28,7 +29,7 @@ dependencies {
providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
providedRuntime 'mysql:mysql-connector-java:5.1.40'
- testCompile project(path: ':juick-server', configuration: 'testArtifacts')
+ testCompile project(path: ':juick-server-jdbc', configuration: 'testArtifacts')
// htmlunit 2.25 isn't compatible with spring-test 4.3.6
testCompile ('net.sourceforge.htmlunit:htmlunit:2.24')
diff --git a/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java b/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
index c6357c90..757aeb06 100644
--- a/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
+++ b/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
@@ -1,7 +1,7 @@
package com.juick.www.configuration;
-import com.juick.server.security.HashParamAuthenticationFilter;
-import com.juick.server.security.entities.JuickUser;
+import com.juick.service.security.HashParamAuthenticationFilter;
+import com.juick.service.security.entities.JuickUser;
import com.juick.service.UserService;
import com.juick.service.security.JuickUserDetailsService;
import org.springframework.beans.factory.annotation.Value;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Help.java b/juick-www/src/main/java/com/juick/www/controllers/Help.java
index 602850de..f40c3b96 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Help.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Help.java
@@ -2,7 +2,7 @@ package com.juick.www.controllers;
import com.juick.server.util.HttpNotFoundException;
import com.juick.service.MessagesService;
-import com.juick.util.UserUtils;
+import com.juick.server.util.UserUtils;
import com.juick.www.HelpService;
import com.juick.www.WebApp;
import org.springframework.stereotype.Controller;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Home.java b/juick-www/src/main/java/com/juick/www/controllers/Home.java
index ebf56b73..d42531e5 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Home.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Home.java
@@ -21,8 +21,8 @@ import com.juick.server.util.HttpNotFoundException;
import com.juick.service.MessagesService;
import com.juick.service.TagService;
import com.juick.service.UserService;
-import com.juick.util.UserUtils;
-import com.juick.util.WebUtils;
+import com.juick.server.util.UserUtils;
+import com.juick.server.util.WebUtils;
import com.juick.www.Utils;
import com.juick.www.WebApp;
import org.apache.commons.codec.CharEncoding;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Login.java b/juick-www/src/main/java/com/juick/www/controllers/Login.java
index e664c1d9..ce9572fa 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Login.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Login.java
@@ -18,7 +18,7 @@
package com.juick.www.controllers;
import com.juick.service.UserService;
-import com.juick.util.UserUtils;
+import com.juick.server.util.UserUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
index 24e100ce..e34207a0 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
@@ -26,7 +26,7 @@ import com.juick.server.util.HttpNotFoundException;
import com.juick.server.util.HttpUtils;
import com.juick.server.util.ImageUtils;
import com.juick.service.*;
-import com.juick.util.UserUtils;
+import com.juick.server.util.UserUtils;
import com.juick.www.Utils;
import com.juick.www.WebApp;
import org.apache.commons.codec.CharEncoding;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/PM.java b/juick-www/src/main/java/com/juick/www/controllers/PM.java
index 0afe5f14..7695226a 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/PM.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/PM.java
@@ -23,9 +23,8 @@ import com.juick.service.MessagesService;
import com.juick.service.PMQueriesService;
import com.juick.service.TagService;
import com.juick.service.UserService;
-import com.juick.util.MessageUtils;
-import com.juick.util.UserUtils;
-import com.juick.util.WebUtils;
+import com.juick.server.util.UserUtils;
+import com.juick.server.util.WebUtils;
import com.juick.www.WebApp;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Settings.java b/juick-www/src/main/java/com/juick/www/controllers/Settings.java
index 6fa3fd2e..21df9d6e 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Settings.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Settings.java
@@ -19,11 +19,12 @@ package com.juick.www.controllers;
import com.juick.server.helpers.NotifyOpts;
import com.juick.server.helpers.UserInfo;
+import com.juick.server.util.HashUtils;
+import com.juick.service.*;
import com.juick.server.util.HttpBadRequestException;
import com.juick.server.util.HttpUtils;
import com.juick.server.util.ImageUtils;
-import com.juick.service.*;
-import com.juick.util.UserUtils;
+import com.juick.server.util.UserUtils;
import com.juick.www.WebApp;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -183,7 +184,7 @@ public class Settings {
break;
case "email-add":
if (!emailService.verifyAddressByCode(visitor.getUid(), request.getParameter("account"))) {
- String authCode = UserUtils.generateHash(8);
+ String authCode = HashUtils.generateHash(8);
if (emailService.addVerificationCode(visitor.getUid(), request.getParameter("account"), authCode)) {
Session session = Session.getDefaultInstance(System.getProperties());
try {
diff --git a/juick-www/src/main/java/com/juick/www/controllers/SignUp.java b/juick-www/src/main/java/com/juick/www/controllers/SignUp.java
index 77971165..cfbd9ca2 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/SignUp.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/SignUp.java
@@ -22,7 +22,7 @@ import com.juick.server.util.HttpForbiddenException;
import com.juick.service.CrosspostService;
import com.juick.service.MessagesService;
import com.juick.service.UserService;
-import com.juick.util.UserUtils;
+import com.juick.server.util.UserUtils;
import com.juick.www.WebApp;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Tags.java b/juick-www/src/main/java/com/juick/www/controllers/Tags.java
index c3ef5153..16f71959 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Tags.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Tags.java
@@ -19,7 +19,7 @@ package com.juick.www.controllers;
import com.juick.service.MessagesService;
import com.juick.service.TagService;
-import com.juick.util.UserUtils;
+import com.juick.server.util.UserUtils;
import com.juick.www.Utils;
import com.juick.www.WebApp;
import org.apache.commons.codec.CharEncoding;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/User.java b/juick-www/src/main/java/com/juick/www/controllers/User.java
index a249d8d0..8bde9bee 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/User.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/User.java
@@ -22,7 +22,7 @@ import com.juick.server.util.HttpNotFoundException;
import com.juick.service.MessagesService;
import com.juick.service.TagService;
import com.juick.service.UserService;
-import com.juick.util.UserUtils;
+import com.juick.server.util.UserUtils;
import com.juick.www.Utils;
import com.juick.www.WebApp;
import org.apache.commons.codec.CharEncoding;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/UserThread.java b/juick-www/src/main/java/com/juick/www/controllers/UserThread.java
index 1d854b8f..cc476309 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/UserThread.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/UserThread.java
@@ -24,7 +24,7 @@ import com.juick.service.MessagesService;
import com.juick.service.TagService;
import com.juick.service.UserService;
import com.juick.util.MessageUtils;
-import com.juick.util.UserUtils;
+import com.juick.server.util.UserUtils;
import com.juick.www.WebApp;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/XMPPPost.java b/juick-www/src/main/java/com/juick/www/controllers/XMPPPost.java
index 45fff7ce..8436fd14 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/XMPPPost.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/XMPPPost.java
@@ -4,7 +4,7 @@ import com.juick.server.util.HttpBadRequestException;
import com.juick.server.util.HttpForbiddenException;
import com.juick.server.util.HttpUtils;
import com.juick.service.TagService;
-import com.juick.util.UserUtils;
+import com.juick.server.util.UserUtils;
import com.juick.www.WebApp;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;