Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
66939ded
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
66939ded
编写于
11月 17, 2009
作者:
D
David Syer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
RESOLVED - issue SPR-6366: Cannot import bean definitions using classpath*: resource location
http://jira.springframework.org/browse/SPR-6366
上级
17887d24
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
33 addition
and
1 deletion
+33
-1
org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
...eans/factory/xml/DefaultBeanDefinitionDocumentReader.java
+3
-1
org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
...ework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
+14
-0
org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/import.xml
...esources/org/springframework/beans/factory/xml/import.xml
+8
-0
org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml
...s/org/springframework/beans/factory/xml/importPattern.xml
+8
-0
未找到文件。
org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
浏览文件 @
66939ded
...
...
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.config.BeanDefinitionHolder;
import
org.springframework.beans.factory.parsing.BeanComponentDefinition
;
import
org.springframework.beans.factory.support.BeanDefinitionReaderUtils
;
import
org.springframework.core.io.Resource
;
import
org.springframework.core.io.support.ResourcePatternUtils
;
import
org.springframework.util.ResourceUtils
;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.SystemPropertyUtils
;
...
...
@@ -172,9 +173,10 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume
boolean
absoluteLocation
=
false
;
try
{
absoluteLocation
=
ResourceUtils
.
toURI
(
location
).
isAbsolute
();
absoluteLocation
=
Resource
PatternUtils
.
isUrl
(
location
)
||
Resource
Utils
.
toURI
(
location
).
isAbsolute
();
}
catch
(
Exception
ex
)
{
// cannot convert to an URI, considering the location relative
// unless it is the well-known Spring prefix classpath*:
}
// check the
...
...
org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
浏览文件 @
66939ded
...
...
@@ -82,6 +82,20 @@ public class XmlBeanDefinitionReaderTests extends TestCase {
testBeanDefinitions
(
registry
);
}
public
void
testWithImport
()
{
SimpleBeanDefinitionRegistry
registry
=
new
SimpleBeanDefinitionRegistry
();;
Resource
resource
=
new
ClassPathResource
(
"import.xml"
,
getClass
());
new
XmlBeanDefinitionReader
(
registry
).
loadBeanDefinitions
(
resource
);
testBeanDefinitions
(
registry
);
}
public
void
testWithWildcardImport
()
{
SimpleBeanDefinitionRegistry
registry
=
new
SimpleBeanDefinitionRegistry
();;
Resource
resource
=
new
ClassPathResource
(
"importPattern.xml"
,
getClass
());
new
XmlBeanDefinitionReader
(
registry
).
loadBeanDefinitions
(
resource
);
testBeanDefinitions
(
registry
);
}
public
void
testWithInputSource
()
{
try
{
SimpleBeanDefinitionRegistry
registry
=
new
SimpleBeanDefinitionRegistry
();;
...
...
org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/import.xml
0 → 100644
浏览文件 @
66939ded
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<import
resource=
"classpath:/org/springframework/beans/factory/xml/test.xml"
/>
</beans>
org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml
0 → 100644
浏览文件 @
66939ded
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<import
resource=
"classpath*:/org/springframework/beans/factory/xml/test.xml"
/>
</beans>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录