Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
92816492
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,体验更适合开发者的 AI 搜索 >>
提交
92816492
编写于
12月 10, 2013
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Established well-defined registration order for Hibernate package scanning
Issue: SPR-7742
上级
eb1b3c5a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
6 deletion
+31
-6
spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java
...gframework/orm/hibernate4/LocalSessionFactoryBuilder.java
+14
-3
spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java
...m/hibernate3/annotation/AnnotationSessionFactoryBean.java
+17
-3
未找到文件。
spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java
浏览文件 @
92816492
...
...
@@ -22,6 +22,7 @@ import java.lang.reflect.Method;
import
java.util.LinkedHashSet
;
import
java.util.Properties
;
import
java.util.Set
;
import
java.util.TreeSet
;
import
javax.persistence.Embeddable
;
import
javax.persistence.Entity
;
import
javax.persistence.MappedSuperclass
;
...
...
@@ -249,6 +250,8 @@ public class LocalSessionFactoryBuilder extends Configuration {
* @throws HibernateException if scanning fails for any reason
*/
public
LocalSessionFactoryBuilder
scanPackages
(
String
...
packagesToScan
)
throws
HibernateException
{
Set
<
String
>
classNames
=
new
TreeSet
<
String
>();
Set
<
String
>
packageNames
=
new
TreeSet
<
String
>();
try
{
for
(
String
pkg
:
packagesToScan
)
{
String
pattern
=
ResourcePatternResolver
.
CLASSPATH_ALL_URL_PREFIX
+
...
...
@@ -260,22 +263,30 @@ public class LocalSessionFactoryBuilder extends Configuration {
MetadataReader
reader
=
readerFactory
.
getMetadataReader
(
resource
);
String
className
=
reader
.
getClassMetadata
().
getClassName
();
if
(
matchesEntityTypeFilter
(
reader
,
readerFactory
))
{
addAnnotatedClass
(
this
.
resourcePatternResolver
.
getClassLoader
().
loadClass
(
className
)
);
classNames
.
add
(
className
);
}
else
if
(
className
.
endsWith
(
PACKAGE_INFO_SUFFIX
))
{
addPackage
(
className
.
substring
(
0
,
className
.
length
()
-
PACKAGE_INFO_SUFFIX
.
length
()));
packageNames
.
add
(
className
.
substring
(
0
,
className
.
length
()
-
PACKAGE_INFO_SUFFIX
.
length
()));
}
}
}
}
return
this
;
}
catch
(
IOException
ex
)
{
throw
new
MappingException
(
"Failed to scan classpath for unlisted classes"
,
ex
);
}
try
{
for
(
String
className
:
classNames
)
{
addAnnotatedClass
(
this
.
resourcePatternResolver
.
getClassLoader
().
loadClass
(
className
));
}
for
(
String
packageName
:
packageNames
)
{
addPackage
(
packageName
);
}
}
catch
(
ClassNotFoundException
ex
)
{
throw
new
MappingException
(
"Failed to load annotated classes from classpath"
,
ex
);
}
return
this
;
}
/**
...
...
spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java
浏览文件 @
92816492
...
...
@@ -17,7 +17,8 @@
package
org.springframework.orm.hibernate3.annotation
;
import
java.io.IOException
;
import
java.util.Set
;
import
java.util.TreeSet
;
import
javax.persistence.Embeddable
;
import
javax.persistence.Entity
;
import
javax.persistence.MappedSuperclass
;
...
...
@@ -25,6 +26,7 @@ import javax.persistence.MappedSuperclass;
import
org.hibernate.HibernateException
;
import
org.hibernate.MappingException
;
import
org.hibernate.cfg.Configuration
;
import
org.springframework.context.ResourceLoaderAware
;
import
org.springframework.core.io.Resource
;
import
org.springframework.core.io.ResourceLoader
;
...
...
@@ -67,6 +69,8 @@ import org.springframework.util.ClassUtils;
* <property name="packagesToScan" value="test.package"/>
* </bean></pre>
*
* <p>Requires Hibernate 3.6 or later, as of Spring 4.0.
*
* @author Juergen Hoeller
* @since 1.2.2
* @see #setDataSource
...
...
@@ -168,6 +172,8 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem
*/
protected
void
scanPackages
(
Configuration
config
)
{
if
(
this
.
packagesToScan
!=
null
)
{
Set
<
String
>
classNames
=
new
TreeSet
<
String
>();
Set
<
String
>
packageNames
=
new
TreeSet
<
String
>();
try
{
for
(
String
pkg
:
this
.
packagesToScan
)
{
String
pattern
=
ResourcePatternResolver
.
CLASSPATH_ALL_URL_PREFIX
+
...
...
@@ -179,10 +185,10 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem
MetadataReader
reader
=
readerFactory
.
getMetadataReader
(
resource
);
String
className
=
reader
.
getClassMetadata
().
getClassName
();
if
(
matchesEntityTypeFilter
(
reader
,
readerFactory
))
{
c
onfig
.
addAnnotatedClass
(
this
.
resourcePatternResolver
.
getClassLoader
().
loadClass
(
className
)
);
c
lassNames
.
add
(
className
);
}
else
if
(
className
.
endsWith
(
PACKAGE_INFO_SUFFIX
))
{
config
.
addPackage
(
className
.
substring
(
0
,
className
.
length
()
-
PACKAGE_INFO_SUFFIX
.
length
()));
packageNames
.
add
(
className
.
substring
(
0
,
className
.
length
()
-
PACKAGE_INFO_SUFFIX
.
length
()));
}
}
}
...
...
@@ -191,6 +197,14 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem
catch
(
IOException
ex
)
{
throw
new
MappingException
(
"Failed to scan classpath for unlisted classes"
,
ex
);
}
try
{
for
(
String
className
:
classNames
)
{
config
.
addAnnotatedClass
(
this
.
resourcePatternResolver
.
getClassLoader
().
loadClass
(
className
));
}
for
(
String
packageName
:
packageNames
)
{
config
.
addPackage
(
packageName
);
}
}
catch
(
ClassNotFoundException
ex
)
{
throw
new
MappingException
(
"Failed to load annotated classes from classpath"
,
ex
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录