drop sphinx search and use datasource autoconfiguration

6 files changed, 11 insertions, 15 deletions

diff --git a/juick-www/src/main/java/com/juick/www/Application.java b/juick-www/src/main/java/com/juick/Application.java
index b5a83f49..f8e5d333 100644
--- a/juick-www/src/main/java/com/juick/www/Application.java
+++ b/juick-www/src/main/java/com/juick/Application.java
@@ -1,11 +1,13 @@
-package com.juick.www;
+package com.juick;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
+@EnableTransactionManagement
 public class Application extends SpringBootServletInitializer {
 
     @Override
diff --git a/juick-www/src/main/java/com/juick/www/configuration/SapeConfiguration.java b/juick-www/src/main/java/com/juick/configuration/SapeConfiguration.java
index 68ff28d2..2630c05b 100644
--- a/juick-www/src/main/java/com/juick/www/configuration/SapeConfiguration.java
+++ b/juick-www/src/main/java/com/juick/configuration/SapeConfiguration.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.www.configuration;
+package com.juick.configuration;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
diff --git a/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java b/juick-www/src/main/java/com/juick/configuration/WebSecurityConfig.java
index 65871088..92f43e64 100644
--- a/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
+++ b/juick-www/src/main/java/com/juick/configuration/WebSecurityConfig.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.www.configuration;
+package com.juick.configuration;
 
 import com.juick.service.UserService;
 import com.juick.service.security.HashParamAuthenticationFilter;
diff --git a/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java b/juick-www/src/main/java/com/juick/configuration/WwwAppConfiguration.java
index 34720c33..ea585a6f 100644
--- a/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java
+++ b/juick-www/src/main/java/com/juick/configuration/WwwAppConfiguration.java
@@ -15,10 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.www.configuration;
+package com.juick.configuration;
 
-import com.juick.configuration.DataConfiguration;
-import com.juick.configuration.SearchConfiguration;
 import com.juick.server.configuration.BaseWebConfiguration;
 import com.juick.server.configuration.StorageConfiguration;
 import com.juick.service.CloudflareCache;
@@ -52,8 +50,8 @@ import java.util.Collections;
  */
 @Configuration
 @EnableCaching
-@Import({ BaseWebConfiguration.class, WebSecurityConfig.class, SapeConfiguration.class, SearchConfiguration.class,
-        DataConfiguration.class, StorageConfiguration.class, XMPPConfiguration.class})
+@Import({ BaseWebConfiguration.class, WebSecurityConfig.class, SapeConfiguration.class,
+        StorageConfiguration.class, XMPPConfiguration.class})
 public class WwwAppConfiguration implements WebMvcConfigurer {
     @Inject
     private UserService userService;
diff --git a/juick-www/src/main/java/com/juick/www/configuration/XMPPConfiguration.java b/juick-www/src/main/java/com/juick/configuration/XMPPConfiguration.java
index 1396f9f9..91f55759 100644
--- a/juick-www/src/main/java/com/juick/www/configuration/XMPPConfiguration.java
+++ b/juick-www/src/main/java/com/juick/configuration/XMPPConfiguration.java
@@ -1,4 +1,4 @@
-package com.juick.www.configuration;
+package com.juick.configuration;
 
 import com.juick.Message;
 import org.slf4j.Logger;
diff --git a/juick-www/src/test/java/com/juick/www/WebAppTests.java b/juick-www/src/test/java/com/juick/WebAppTests.java
index c34fcea8..ca318738 100644
--- a/juick-www/src/test/java/com/juick/www/WebAppTests.java
+++ b/juick-www/src/test/java/com/juick/WebAppTests.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.www;
+package com.juick;
 
 import com.gargoylesoftware.htmlunit.CookieManager;
 import com.gargoylesoftware.htmlunit.Page;
@@ -26,12 +26,9 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.juick.Message;
 import com.juick.Tag;
 import com.juick.User;
-import com.juick.configuration.DataConfiguration;
 import com.juick.service.*;
 import com.juick.util.MessageUtils;
-import com.juick.www.configuration.SapeConfiguration;
-import com.juick.www.configuration.WebSecurityConfig;
-import com.juick.www.configuration.WwwAppConfiguration;
+import com.juick.www.WebApp;
 import com.mitchellbosecke.pebble.PebbleEngine;
 import com.mitchellbosecke.pebble.error.PebbleException;
 import com.mitchellbosecke.pebble.template.PebbleTemplate;
@@ -47,7 +44,6 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;