Skip to content

Commit 66939de

Browse files
author
David Syer
committed
RESOLVED - issue SPR-6366: Cannot import bean definitions using classpath*: resource location
http://jira.springframework.org/browse/SPR-6366
1 parent 17887d2 commit 66939de

4 files changed

Lines changed: 33 additions & 1 deletion

File tree

‎org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
2828
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
2929
import org.springframework.core.io.Resource;
30+
import org.springframework.core.io.support.ResourcePatternUtils;
3031
import org.springframework.util.ResourceUtils;
3132
import org.springframework.util.StringUtils;
3233
import org.springframework.util.SystemPropertyUtils;
@@ -172,9 +173,10 @@ protected void importBeanDefinitionResource(Element ele) {
172173
boolean absoluteLocation = false;
173174

174175
try {
175-
absoluteLocation = ResourceUtils.toURI(location).isAbsolute();
176+
absoluteLocation = ResourcePatternUtils.isUrl(location) || ResourceUtils.toURI(location).isAbsolute();
176177
} catch (Exception ex) {
177178
// cannot convert to an URI, considering the location relative
179+
// unless it is the well-known Spring prefix classpath*:
178180
}
179181

180182
// check the

‎org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,20 @@ public void testWithOpenInputStreamAndExplicitValidationMode() {
8282
testBeanDefinitions(registry);
8383
}
8484

85+
public void testWithImport() {
86+
SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
87+
Resource resource = new ClassPathResource("import.xml", getClass());
88+
new XmlBeanDefinitionReader(registry).loadBeanDefinitions(resource);
89+
testBeanDefinitions(registry);
90+
}
91+
92+
public void testWithWildcardImport() {
93+
SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
94+
Resource resource = new ClassPathResource("importPattern.xml", getClass());
95+
new XmlBeanDefinitionReader(registry).loadBeanDefinitions(resource);
96+
testBeanDefinitions(registry);
97+
}
98+
8599
public void testWithInputSource() {
86100
try {
87101
SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
3+
4+
<beans>
5+
6+
<import resource="classpath:/org/springframework/beans/factory/xml/test.xml"/>
7+
8+
</beans>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
3+
4+
<beans>
5+
6+
<import resource="classpath*:/org/springframework/beans/factory/xml/test.xml"/>
7+
8+
</beans>

0 commit comments

Comments
 (0)