diff options
author | Alexander Alexeev | 2016-11-21 13:38:27 +0700 |
---|---|---|
committer | Vitaly Takmazov | 2016-11-23 13:03:05 +0300 |
commit | 771c27021c033f5b6b9a3d9fdcd4048f9d8023af (patch) | |
tree | 558442fc7e5244953a8acc7444fb5c9a764f646a /juick-spring-www/src/main/java/com/juick/www/configuration/WwwServletConfiguration.java | |
parent | e9aa20922c82bfad64adbcb6466ebdac23a84244 (diff) |
spring-www project skeleton
Diffstat (limited to 'juick-spring-www/src/main/java/com/juick/www/configuration/WwwServletConfiguration.java')
-rw-r--r-- | juick-spring-www/src/main/java/com/juick/www/configuration/WwwServletConfiguration.java | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/juick-spring-www/src/main/java/com/juick/www/configuration/WwwServletConfiguration.java b/juick-spring-www/src/main/java/com/juick/www/configuration/WwwServletConfiguration.java index 8edc1b6c..01cee39f 100644 --- a/juick-spring-www/src/main/java/com/juick/www/configuration/WwwServletConfiguration.java +++ b/juick-spring-www/src/main/java/com/juick/www/configuration/WwwServletConfiguration.java @@ -6,14 +6,13 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import org.springframework.context.support.ReloadableResourceBundleMessageSource; import org.springframework.context.support.ResourceBundleMessageSource; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; -import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; import org.thymeleaf.spring4.SpringTemplateEngine; import org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver; import org.thymeleaf.spring4.view.ThymeleafViewResolver; @@ -64,20 +63,10 @@ public class WwwServletConfiguration extends WebMvcConfigurationSupport { public ThymeleafViewResolver viewResolver() { ThymeleafViewResolver viewResolver = new ThymeleafViewResolver(); viewResolver.setTemplateEngine(templateEngine()); - // NOTE 'order' and 'viewNames' are optional - viewResolver.setOrder(1); - viewResolver.setViewNames(new String[]{".html", ".xhtml"}); return viewResolver; } @Override - public RequestMappingHandlerMapping requestMappingHandlerMapping() { - RequestMappingHandlerMapping mapping = super.requestMappingHandlerMapping(); - mapping.setUseSuffixPatternMatch(false); - return mapping; - } - - @Override protected void configureMessageConverters(List<HttpMessageConverter<?>> converters) { Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder() .serializationInclusion(JsonInclude.Include.NON_DEFAULT) @@ -97,6 +86,7 @@ public class WwwServletConfiguration extends WebMvcConfigurationSupport { registry.setOrder(0); registry.addResourceHandler("/scripts.js").addResourceLocations("/"); registry.addResourceHandler("/style.css").addResourceLocations("/"); + registry.addResourceHandler("/favicon.ico").addResourceLocations("/static/favicon.ico"); } @Bean @@ -109,4 +99,8 @@ public class WwwServletConfiguration extends WebMvcConfigurationSupport { return messageSource; } + + @Override + protected void addViewControllers(ViewControllerRegistry registry) { + } } |