From aaf50a768c721f60cbcf78be73b88abbf94e0145 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 15 May 2014 14:54:14 +0100 Subject: [PATCH] spring.freemarker.templateLoaderPath -> path Fixup tests and documentation following the rename of spring.freemarker.templateLoaderPath to spring.freemarker.path --- .../boot/autoconfigure/condition/OnBeanCondition.java | 2 +- .../freemarker/FreeMarkerTemplateAvailabilityProviderTests.java | 2 +- .../src/main/asciidoc/appendix-application-properties.adoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java index 435a5f659a..1490d1c162 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java @@ -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. diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProviderTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProviderTests.java index 0b24a93876..8a43da13e2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProviderTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProviderTests.java @@ -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, diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index bbc3660a17..c26bbfce2c 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -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])