Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spring.freemarker.templateLoaderPath -> path

Browse Source 
Fixup tests and documentation following the rename of
spring.freemarker.templateLoaderPath to spring.freemarker.path
This commit is contained in:
Phillip Webb
2014-05-15 14:54:14 +01:00
parent d2112e27a3
commit aaf50a768c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
On * Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProviderTests.java
View File

@@ -52,7 +52,7 @@ public class FreeMarkerTemplateAvailabilityProviderTests {
@Test
public void availabilityOfTemplateWithCustomLoaderPath() {
this.environment.setProperty("spring.freemarker.templateLoaderPath",
this.environment.setProperty("spring.freemarker.path",
"classpath:/custom-templates/");
assertTrue(this.provider.isTemplateAvailable("custom", this.environment,

2
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@@ -96,7 +96,7 @@ content into your application; rather pick only the properties that you need.
spring.freemarker.requestContextAttribute=
spring.freemarker.suffix=
spring.freemarker.templateEncoding=UTF-8
spring.freemarker.templateLoaderPath=classpath:/templates/
spring.freemarker.path=classpath:/templates/
spring.freemarker.viewNames=
# INTERNATIONALIZATION ({sc-spring-boot-autoconfigure}/MessageSourceAutoConfiguration.{sc-ext}[MessageSourceAutoConfiguration])