Skip to content

Commit 3bb01ee

Browse files
committed
Revert "Introduce (Annotation)SessionFactoryBuilder types"
This commit and the several before it back out the SessionFactoryBuilder and AnnotationSessionFactoryBuilder types recently introduced in 3.1 M2. This is in light of the impending release of Hibernate 4.0 GA and our own support for it the new org.springframework.orm.hibernate4 package (not yet committed). This new package will have a similar, but far simpler, arrangement of a single LocalSessionFactoryBuilder and LocalSessionFactoryBean pair. Hibernate 3.x support will remain largely as-is, however the HibernateTransactionManager introduced with SPR-8076 will remain. This reverts commit 9e82591. Issue: SPR-8066, SPR-7936, SPR-8076, SPR-8098, SPR-8096, SPR-7387
1 parent 2579644 commit 3bb01ee

38 files changed

+1745
-3012
lines changed

org.springframework.integration-tests/integration-tests.iml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<orderEntry type="library" name="Hamcrest" level="project" />
3434
<orderEntry type="library" name="JUnit" level="project" />
3535
<orderEntry type="library" name="Log4j" level="project" />
36-
<orderEntry type="library" name="SLF4j" level="project" />
3736
<orderEntry type="module-library">
3837
<library>
3938
<CLASSES>

org.springframework.integration-tests/ivy.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@
7474
<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations.common" rev="3.3.0.ga" conf="test->compile"/>
7575
<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="test->compile"/>
7676
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
77-
<dependency org="org.jboss.javassist" name="com.springsource.javassist" rev="3.3.0.ga" conf="test->runtime"/>
7877
<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
79-
<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
8078
<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
8179
<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="test->compile"/>
8280
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>

org.springframework.integration-tests/src/test/java/org/springframework/orm/hibernate3/HibernateSessionFactoryConfigurationTests.java

Lines changed: 0 additions & 340 deletions
This file was deleted.

org.springframework.integration-tests/src/test/java/org/springframework/orm/hibernate3/scannable/Foo.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)