"file-encoding" attribute value is being applied correctly (SPR-8024)

jhoeller · jhoeller · commit 0862a2906662 · 2011-12-22T03:05:40.000+01:00
diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/AbstractPropertyLoadingBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/context/config/AbstractPropertyLoadingBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2011 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.
@@ -53,7 +53,7 @@ protected void doParse(Element element, BeanDefinitionBuilder builder) {
 
 		String fileEncoding = element.getAttribute("file-encoding");
 		if (StringUtils.hasLength(fileEncoding)) {
-			builder.addPropertyReference("fileEncoding", fileEncoding);
+			builder.addPropertyValue("fileEncoding", fileEncoding);
 		}
 
 		String order = element.getAttribute("order");
diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/PropertyPlaceholderBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/context/config/PropertyPlaceholderBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2011 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.
@@ -38,12 +38,9 @@ protected Class getBeanClass(Element element) {
 	
 	@Override
 	protected void doParse(Element element, BeanDefinitionBuilder builder) {
-	
 		super.doParse(element, builder);
-
 		builder.addPropertyValue("ignoreUnresolvablePlaceholders",
 				Boolean.valueOf(element.getAttribute("ignore-unresolvable")));
-
 		String systemPropertiesModeName = element.getAttribute("system-properties-mode");
 		if (StringUtils.hasLength(systemPropertiesModeName)) {
 			builder.addPropertyValue("systemPropertiesModeName", "SYSTEM_PROPERTIES_MODE_"+systemPropertiesModeName);
diff --git a/org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml b/org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml
@@ -7,7 +7,8 @@
 				http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<context:property-placeholder
-		location="classpath*:/org/springframework/context/config/test-*.properties,classpath*:/org/springframework/context/config/empty-*.properties,classpath*:/org/springframework/context/config/missing-*.properties" />
+			location="classpath*:/org/springframework/context/config/test-*.properties,classpath*:/org/springframework/context/config/empty-*.properties,classpath*:/org/springframework/context/config/missing-*.properties"
+			file-encoding="ISO-8859-1"/>
 
 	<bean id="foo" class="java.lang.String">
 		<constructor-arg value="${foo}" />

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2008 the original author or authors.`
	`2`	`+ * Copyright 2002-2011 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -53,7 +53,7 @@ protected void doParse(Element element, BeanDefinitionBuilder builder) {`
`53`	`53`
`54`	`54`	`String fileEncoding = element.getAttribute("file-encoding");`
`55`	`55`	`if (StringUtils.hasLength(fileEncoding)) {`
`56`		`- builder.addPropertyReference("fileEncoding", fileEncoding);`
	`56`	`+ builder.addPropertyValue("fileEncoding", fileEncoding);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`String order = element.getAttribute("order");`