Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
d5492264
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,发现更多精彩内容 >>
提交
d5492264
编写于
10月 11, 2011
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
made compilation work with Hibernate 4.0 next to Hibernate 3.x
上级
3032b214
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
6 addition
and
5 deletion
+6
-5
org.springframework.orm/ivy.xml
org.springframework.orm/ivy.xml
+1
-1
org.springframework.orm/orm.iml
org.springframework.orm/orm.iml
+2
-2
org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
...ramework/orm/hibernate3/LocalSessionFactoryBeanTests.java
+3
-2
未找到文件。
org.springframework.orm/ivy.xml
浏览文件 @
d5492264
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
<dependency
org=
"org.hibernate"
name=
"com.springsource.org.hibernate"
rev=
"3.3.1.GA"
conf=
"optional, hibernate->compile"
/>
<dependency
org=
"org.hibernate"
name=
"com.springsource.org.hibernate"
rev=
"3.3.1.GA"
conf=
"optional, hibernate->compile"
/>
<dependency
org=
"org.hibernate"
name=
"com.springsource.org.hibernate.annotations"
rev=
"3.4.0.GA"
conf=
"optional, hibernate-jpa->compile"
/>
<dependency
org=
"org.hibernate"
name=
"com.springsource.org.hibernate.annotations"
rev=
"3.4.0.GA"
conf=
"optional, hibernate-jpa->compile"
/>
<dependency
org=
"org.hibernate"
name=
"com.springsource.org.hibernate.ejb"
rev=
"3.4.0.GA"
conf=
"optional, hibernate-jpa->compile"
/>
<dependency
org=
"org.hibernate"
name=
"com.springsource.org.hibernate.ejb"
rev=
"3.4.0.GA"
conf=
"optional, hibernate-jpa->compile"
/>
<dependency
org=
"org.hibernate"
name=
"com.springsource.org.hibernate"
rev=
"4.0.0.CR4"
conf=
"optional, hibernate->compile"
/>
<dependency
org=
"org.hibernate"
name=
"com.springsource.org.hibernate
.core
"
rev=
"4.0.0.CR4"
conf=
"optional, hibernate->compile"
/>
<dependency
org=
"javax.jdo"
name=
"com.springsource.javax.jdo"
rev=
"2.1.0"
conf=
"provided, jdo->compile"
/>
<dependency
org=
"javax.jdo"
name=
"com.springsource.javax.jdo"
rev=
"2.1.0"
conf=
"provided, jdo->compile"
/>
<dependency
org=
"javax.persistence"
name=
"com.springsource.javax.persistence"
rev=
"1.0.0"
conf=
"provided, jpa->compile"
/>
<dependency
org=
"javax.persistence"
name=
"com.springsource.javax.persistence"
rev=
"1.0.0"
conf=
"provided, jpa->compile"
/>
<dependency
org=
"javax.servlet"
name=
"com.springsource.javax.servlet"
rev=
"2.5.0"
conf=
"provided, web->compile"
/>
<dependency
org=
"javax.servlet"
name=
"com.springsource.javax.servlet"
rev=
"2.5.0"
conf=
"provided, web->compile"
/>
...
...
org.springframework.orm/orm.iml
浏览文件 @
d5492264
...
@@ -221,11 +221,11 @@
...
@@ -221,11 +221,11 @@
<orderEntry
type=
"module-library"
>
<orderEntry
type=
"module-library"
>
<library>
<library>
<CLASSES>
<CLASSES>
<root
url=
"jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate
/4.0.0.CR4/com.springsource.org.hibernat
e-4.0.0.CR4.jar!/"
/>
<root
url=
"jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate
.core/4.0.0.CR4/com.springsource.org.hibernate.cor
e-4.0.0.CR4.jar!/"
/>
</CLASSES>
</CLASSES>
<JAVADOC
/>
<JAVADOC
/>
<SOURCES>
<SOURCES>
<root
url=
"jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate
/4.0.0.CR4/com.springsource.org.hibernat
e-sources-4.0.0.CR4.jar!/"
/>
<root
url=
"jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate
.core/4.0.0.CR4/com.springsource.org.hibernate.cor
e-sources-4.0.0.CR4.jar!/"
/>
</SOURCES>
</SOURCES>
</library>
</library>
</orderEntry>
</orderEntry>
...
...
org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
浏览文件 @
d5492264
/*
/*
* Copyright 2002-201
0
the original author or authors.
* Copyright 2002-201
1
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -32,7 +32,6 @@ import javax.transaction.TransactionManager;
...
@@ -32,7 +32,6 @@ import javax.transaction.TransactionManager;
import
junit.framework.TestCase
;
import
junit.framework.TestCase
;
import
org.easymock.MockControl
;
import
org.easymock.MockControl
;
import
org.hibernate.Hibernate
;
import
org.hibernate.HibernateException
;
import
org.hibernate.HibernateException
;
import
org.hibernate.Interceptor
;
import
org.hibernate.Interceptor
;
import
org.hibernate.SessionFactory
;
import
org.hibernate.SessionFactory
;
...
@@ -538,6 +537,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
...
@@ -538,6 +537,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
assertEquals
(
listeners
,
registeredListeners
);
assertEquals
(
listeners
,
registeredListeners
);
}
}
/*
public void testLocalSessionFactoryBeanWithFilterDefinitions() throws Exception {
public void testLocalSessionFactoryBeanWithFilterDefinitions() throws Exception {
XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("filterDefinitions.xml", getClass()));
XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("filterDefinitions.xml", getClass()));
FilterTestLocalSessionFactoryBean sf = (FilterTestLocalSessionFactoryBean) xbf.getBean("&sessionFactory");
FilterTestLocalSessionFactoryBean sf = (FilterTestLocalSessionFactoryBean) xbf.getBean("&sessionFactory");
...
@@ -555,6 +555,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
...
@@ -555,6 +555,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
assertEquals(1, filter2.getParameterNames().size());
assertEquals(1, filter2.getParameterNames().size());
assertEquals(Hibernate.INTEGER, filter2.getParameterType("myParam"));
assertEquals(Hibernate.INTEGER, filter2.getParameterType("myParam"));
}
}
*/
public
void
testLocalSessionFactoryBeanWithTypeDefinitions
()
throws
Exception
{
public
void
testLocalSessionFactoryBeanWithTypeDefinitions
()
throws
Exception
{
XmlBeanFactory
xbf
=
new
XmlBeanFactory
(
new
ClassPathResource
(
"typeDefinitions.xml"
,
getClass
()));
XmlBeanFactory
xbf
=
new
XmlBeanFactory
(
new
ClassPathResource
(
"typeDefinitions.xml"
,
getClass
()));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录