root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

do not insist on a "dataSource" reference being set (SPR-8924)

This commit is contained in:
Juergen Hoeller 2011-12-22 02:33:56 +01:00 committed by Chris Beams
parent 2caca29498
commit 09ac195f0c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java
View File

@ -77,6 +77,7 @@ public class LocalSessionFactoryBuilder extends Configuration {
/** /**
* Create a new LocalSessionFactoryBuilder for the given DataSource. * Create a new LocalSessionFactoryBuilder for the given DataSource.
* @param dataSource the JDBC DataSource that the resulting Hibernate SessionFactory should be using * @param dataSource the JDBC DataSource that the resulting Hibernate SessionFactory should be using
* (may be <code>null</code>)
*/ */
public LocalSessionFactoryBuilder(DataSource dataSource) { public LocalSessionFactoryBuilder(DataSource dataSource) {
this(dataSource, new PathMatchingResourcePatternResolver()); this(dataSource, new PathMatchingResourcePatternResolver());
@ -85,6 +86,7 @@ public class LocalSessionFactoryBuilder extends Configuration {
/** /**
* Create a new LocalSessionFactoryBuilder for the given DataSource. * Create a new LocalSessionFactoryBuilder for the given DataSource.
* @param dataSource the JDBC DataSource that the resulting Hibernate SessionFactory should be using * @param dataSource the JDBC DataSource that the resulting Hibernate SessionFactory should be using
* (may be <code>null</code>)
* @param classLoader the ClassLoader to load application classes from * @param classLoader the ClassLoader to load application classes from
*/ */
public LocalSessionFactoryBuilder(DataSource dataSource, ClassLoader classLoader) { public LocalSessionFactoryBuilder(DataSource dataSource, ClassLoader classLoader) {
@ -94,11 +96,14 @@ public class LocalSessionFactoryBuilder extends Configuration {
/** /**
* Create a new LocalSessionFactoryBuilder for the given DataSource. * Create a new LocalSessionFactoryBuilder for the given DataSource.
* @param dataSource the JDBC DataSource that the resulting Hibernate SessionFactory should be using * @param dataSource the JDBC DataSource that the resulting Hibernate SessionFactory should be using
* (may be <code>null</code>)
* @param classLoader the ResourceLoader to load application classes from * @param classLoader the ResourceLoader to load application classes from
*/ */
public LocalSessionFactoryBuilder(DataSource dataSource, ResourceLoader resourceLoader) { public LocalSessionFactoryBuilder(DataSource dataSource, ResourceLoader resourceLoader) {
getProperties().put(Environment.CURRENT_SESSION_CONTEXT_CLASS, SpringSessionContext.class.getName()); getProperties().put(Environment.CURRENT_SESSION_CONTEXT_CLASS, SpringSessionContext.class.getName());
if (dataSource != null) {
getProperties().put(Environment.DATASOURCE, dataSource); getProperties().put(Environment.DATASOURCE, dataSource);
}
getProperties().put("hibernate.classLoader.application", resourceLoader.getClassLoader()); getProperties().put("hibernate.classLoader.application", resourceLoader.getClassLoader());
this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader); this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader);
} }