You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/06/18 14:30:31 UTC
[5/9] incubator-freemarker git commit: FREEMARKER-54: use property
wherever easier than settings map.
FREEMARKER-54: use property wherever easier than settings map.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/18ee8a08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/18ee8a08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/18ee8a08
Branch: refs/heads/3
Commit: 18ee8a0846dbbbf4b853af8f76509f331bfb07ae
Parents: 99c3c0c
Author: Woonsan Ko <wo...@apache.org>
Authored: Thu Jun 15 23:23:42 2017 -0400
Committer: Woonsan Ko <wo...@apache.org>
Committed: Thu Jun 15 23:23:42 2017 -0400
----------------------------------------------------------------------
.../apache/freemarker/spring/ConfigurationFactoryBeanTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/18ee8a08/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java
----------------------------------------------------------------------
diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java
index 59261aa..0938f5b 100644
--- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java
+++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java
@@ -77,19 +77,20 @@ public class ConfigurationFactoryBeanTest {
settings.put(MutableParsingAndProcessingConfiguration.TAB_SIZE_KEY, "4");
settings.put(ExtendableBuilder.OBJECT_WRAPPER_KEY, "restricted");
- settings.put(ExtendableBuilder.LOCALIZED_TEMPLATE_LOOKUP_KEY, "false");
settings.put(ExtendableBuilder.TEMPLATE_CACHE_STORAGE_KEY, "strong:20, soft:250");
- settings.put(ExtendableBuilder.TEMPLATE_UPDATE_DELAY_KEY, "1m");
final Map<String, Object> sharedVars = new HashMap<>();
sharedVars.put("sharedVar1", "sharedVal1");
sharedVars.put("sharedVar2", "sharedVal2");
+ // Creating bean definition which is equivalent to <bean/> element in Spring XML configuration.
BeanDefinition beanDef =
BeanDefinitionBuilder.genericBeanDefinition(ConfigurationFactoryBean.class.getName())
.addPropertyValue("incompatibleImprovements", new Version(3, 0, 0))
.addPropertyValue("settings", settings)
.addPropertyValue("sharedVariables", sharedVars)
+ .addPropertyValue("templateUpdateDelayMilliseconds", 60000)
+ .addPropertyValue("localizedTemplateLookup", "false")
.getBeanDefinition();
appContext.registerBeanDefinition("freemarkerConfig", beanDef);