From bebe7c159f00e6d5a83bb786824d5f32e4de9270 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 24 Feb 2018 16:54:28 +0300
Subject: spring boot wip

---
 .../java/com/juick/www/configuration/WwwAppConfiguration.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java')

diff --git a/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java b/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java
index e04538e8..250197f7 100644
--- a/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java
+++ b/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java
@@ -17,6 +17,10 @@
 
 package com.juick.www.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;
 import com.juick.service.TagService;
 import com.juick.service.UserService;
@@ -29,7 +33,7 @@ import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.caffeine.CaffeineCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.Import;
 
 import javax.inject.Inject;
 import java.util.Collections;
@@ -38,9 +42,10 @@ import java.util.Collections;
  * Created by aalexeev on 11/22/16.
  */
 @Configuration
-@PropertySource(value = "classpath:juick.conf", ignoreResourceNotFound = true)
 @EnableCaching
-public class WwwAppConfiguration {
+@Import({WwwServletConfiguration.class, WebSecurityConfig.class, SapeConfiguration.class, SearchConfiguration.class,
+        DataConfiguration.class, StorageConfiguration.class})
+public class WwwAppConfiguration extends BaseWebConfiguration {
     @Inject
     private UserService userService;
     @Inject
-- 
cgit v1.2.3