root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-10-30 15:21:55 +00:00
parent 0cdb1d3f22 0f17142366
commit 36ffad2bb7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java
View File

@ -47,6 +47,7 @@ import org.springframework.core.Ordered;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.web.servlet.view.UrlBasedViewResolver;
/**
* Autoconfiguration support for Groovy templates in MVC. By default creates a
@ -54,6 +55,7 @@ import org.springframework.core.io.ResourceLoader;
* can override that by providing a {@link TemplateEngine} of a different type.
*
* @author Dave Syer
* @author Andy Wilkinson
* @since 1.1.0
*/
@Configuration
@ -144,7 +146,8 @@ public class GroovyTemplateAutoConfiguration {
}
@Configuration
@ConditionalOnClass({ Servlet.class, LocaleContextHolder.class })
@ConditionalOnClass({ Servlet.class, LocaleContextHolder.class,
UrlBasedViewResolver.class })
@ConditionalOnWebApplication
public static class GroovyWebConfiguration {