merge configuration

1 files changed, 14 insertions, 0 deletions

diff --git a/juick-spring-www/src/main/java/com/juick/www/configuration/WebAppConfiguration.java b/juick-spring-www/src/main/java/com/juick/www/configuration/WebAppConfiguration.java
index c9ecfeac..b314db64 100644
--- a/juick-spring-www/src/main/java/com/juick/www/configuration/WebAppConfiguration.java
+++ b/juick-spring-www/src/main/java/com/juick/www/configuration/WebAppConfiguration.java
@@ -1,7 +1,10 @@
 package com.juick.www.configuration;
 
+import com.juick.www.HelpService;
 import com.juick.www.WebApp;
 import com.juick.www.settings.TemplateSettingsHolder;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.guava.GuavaCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
@@ -15,6 +18,7 @@ import javax.annotation.Resource;
  */
 @Configuration
 @PropertySource("classpath:juick.conf")
+@EnableCaching
 public class WebAppConfiguration {
     @Resource
     private Environment env;
@@ -40,4 +44,14 @@ public class WebAppConfiguration {
     public WebApp webApp() {
         return new WebApp(env);
     }
+
+    @Bean
+    public GuavaCacheManager cacheManager() {
+        return new GuavaCacheManager("help");
+    }
+
+    @Bean
+    public HelpService helpService() {
+        return new HelpService("help");
+    }
 }