From 1a9599c81550154600d8af49471f862e10694e58 Mon Sep 17 00:00:00 2001
From: David Syer <dsyer@vmware.com>
Date: Tue, 27 Oct 2009 14:49:10 +0000
Subject: [PATCH] RESOLVED - issue SPR-4661: Improve
 context-property-placeholder configurablity Classpath ordering broke the
 build (duh: test-classes comes before classes in Maven but not Ant).

---
 .../context/config/contextNamespaceHandlerTests-location.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 5eece8d4254..980835347bc 100644
--- 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,7 @@
 				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" />
 
 	<bean id="foo" class="java.lang.String">
 		<constructor-arg value="${foo}" />