Skip to content

Commit 6aa0e62

Browse files
committed
compatibility with Hibernate 3.5 final
1 parent 52179d8 commit 6aa0e62

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

build-spring-framework/resources/changelog.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ SPRING FRAMEWORK CHANGELOG
33
http://www.springsource.org
44

55

6-
Changes in version 3.0.2 (2010-03-31)
6+
Changes in version 3.0.2 (2010-04-01)
77
-------------------------------------
88

99
* fixed cross-module version ranges in OSGi manifests
1010
* fixed contents of org.springframework.web.struts jar
1111
* upgraded to Hibernate Validator 4.0.2 and Jackson 1.4.2
1212
* restored compatibility with Servlet 2.4 containers on all VMs
13-
* compatibility with OpenJPA 2.0 (support for persistence.xml versioning)
14-
* compatibility with Hessian 4.0 in terms of exception propagation
15-
* compatibility with JasperReports 3.x in terms of resource management
13+
* compatibility with Hibernate 3.5 final (native and also as a JPA 2.0 provider)
14+
* compatibility with OpenJPA 2.0 (support for JPA 2.0 persistence.xml versioning)
15+
* compatibility with Hessian 4.0 (in terms of exception propagation)
16+
* compatibility with JasperReports 3.x (in terms of resource management)
1617
* PropertyEditor lookup fallback works on Google App Engine as well (e.g. for form tags)
1718
* fixed TypeDescriptor/MethodParameter toString for all cases in debug log messages
1819
* widened AbstractFactoryBean's "getObjectType" signature to return any Class as well
@@ -36,7 +37,7 @@ Changes in version 3.0.2 (2010-03-31)
3637
* DispatcherPortlet passes handler instance into HandlerExceptionResolver for action exception
3738
* DispatcherPortlet applies preHandleRender callbacks in case of action exception as well
3839
* UrlPathHelper cuts off trailing servlet-path slashes for root mappings (on WebSphere)
39-
* introduced support for HttpEntity wrapper, containing headers in addition to body value
40+
* introduced support for HttpEntity and ResponseEntity wrappers, adding context to body values
4041
* fixed DataBinder's conversion error handling for direct field access with ConversionService
4142
* @InitBinder methods support all applicable Spring 3.0 parameter annotations as well
4243
* @ExceptionHandler methods consistently receive original exception as thrown by user methods

org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2009 the original author or authors.
2+
* Copyright 2002-2010 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
2323
import java.util.ArrayList;
2424
import java.util.List;
2525
import java.util.Properties;
26-
2726
import javax.sql.DataSource;
2827

2928
import junit.framework.TestCase;
@@ -123,7 +122,7 @@ protected SessionFactory newSessionFactory(Configuration config) throws Hibernat
123122
}
124123
};
125124
lsfb.afterPropertiesSet();
126-
final SessionFactory sfProxy = (SessionFactory) lsfb.getObject();
125+
final SessionFactory sfProxy = lsfb.getObject();
127126

128127
HibernateTransactionManager tm = new HibernateTransactionManager();
129128
tm.setJdbcExceptionTranslator(new SQLStateSQLExceptionTranslator());
@@ -345,7 +344,7 @@ protected SessionFactory newSessionFactory(Configuration config) throws Hibernat
345344
}
346345
};
347346
lsfb.afterPropertiesSet();
348-
final SessionFactory sfProxy = (SessionFactory) lsfb.getObject();
347+
final SessionFactory sfProxy = lsfb.getObject();
349348

350349
HibernateTransactionManager tm = new HibernateTransactionManager();
351350
tm.setJdbcExceptionTranslator(new SQLStateSQLExceptionTranslator());
@@ -422,7 +421,7 @@ protected SessionFactory newSessionFactory(Configuration config) throws Hibernat
422421
}
423422
};
424423
lsfb.afterPropertiesSet();
425-
final SessionFactory sfProxy = (SessionFactory) lsfb.getObject();
424+
final SessionFactory sfProxy = lsfb.getObject();
426425

427426
PlatformTransactionManager tm = new HibernateTransactionManager(sfProxy);
428427
final TransactionTemplate tt = new TransactionTemplate(tm);
@@ -776,7 +775,7 @@ protected SessionFactory newSessionFactory(Configuration config) throws Hibernat
776775
}
777776
};
778777
lsfb.afterPropertiesSet();
779-
final SessionFactory sfProxy = (SessionFactory) lsfb.getObject();
778+
final SessionFactory sfProxy = lsfb.getObject();
780779

781780
PlatformTransactionManager tm = new HibernateTransactionManager(sfProxy);
782781
TransactionTemplate tt = new TransactionTemplate(tm);
@@ -860,7 +859,7 @@ protected SessionFactory newSessionFactory(Configuration config) throws Hibernat
860859
}
861860
};
862861
lsfb.afterPropertiesSet();
863-
final SessionFactory sfProxy = (SessionFactory) lsfb.getObject();
862+
final SessionFactory sfProxy = lsfb.getObject();
864863

865864
PlatformTransactionManager tm = new HibernateTransactionManager(sfProxy);
866865
TransactionTemplate tt = new TransactionTemplate(tm);
@@ -1657,7 +1656,7 @@ public void testTransactionCommitWithNonExistingDatabase() throws Exception {
16571656
props.setProperty("hibernate.cache.provider_class", NoCacheProvider.class.getName());
16581657
lsfb.setHibernateProperties(props);
16591658
lsfb.afterPropertiesSet();
1660-
final SessionFactory sf = (SessionFactory) lsfb.getObject();
1659+
final SessionFactory sf = lsfb.getObject();
16611660

16621661
HibernateTransactionManager tm = new HibernateTransactionManager();
16631662
tm.setSessionFactory(sf);
@@ -1698,7 +1697,7 @@ public void testTransactionCommitWithPreBoundSessionAndNonExistingDatabase() thr
16981697
props.setProperty("hibernate.cache.provider_class", NoCacheProvider.class.getName());
16991698
lsfb.setHibernateProperties(props);
17001699
lsfb.afterPropertiesSet();
1701-
final SessionFactory sf = (SessionFactory) lsfb.getObject();
1700+
final SessionFactory sf = lsfb.getObject();
17021701

17031702
HibernateTransactionManager tm = new HibernateTransactionManager();
17041703
tm.setSessionFactory(sf);
@@ -1751,9 +1750,10 @@ public void testTransactionCommitWithNonExistingDatabaseAndLazyConnection() thro
17511750
Properties props = new Properties();
17521751
props.setProperty("hibernate.dialect", HSQLDialect.class.getName());
17531752
props.setProperty("hibernate.cache.provider_class", NoCacheProvider.class.getName());
1753+
props.setProperty("hibernate.temp.use_jdbc_metadata_defaults", "false");
17541754
lsfb.setHibernateProperties(props);
17551755
lsfb.afterPropertiesSet();
1756-
final SessionFactory sf = (SessionFactory) lsfb.getObject();
1756+
final SessionFactory sf = lsfb.getObject();
17571757

17581758
HibernateTransactionManager tm = new HibernateTransactionManager();
17591759
tm.setSessionFactory(sf);

0 commit comments

Comments
 (0)