Make sure there are no multiple instantiations of sessionFactories

git-svn-id: https://svn.argeo.org/slc/trunk@2816 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/sessionFactories.xml b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/sessionFactories.xml
index 3aafce864e99a85fc4dd333bdc50647320d8d118..175ae4e565814dd0406e6190ee83b105fe6c4c46 100644 (file)
--- a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/sessionFactories.xml
+++ b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/sessionFactories.xml
@@ -4,16 +4,6 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
        default-lazy-init="true">
 
-       <bean id="slcDefault.dataSource.inMemoryTestHSQL"
-               class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
-               destroy-method="destroy">
-               <property name="driverClassName" value="org.hsqldb.jdbcDriver" />
-               <property name="url" value="jdbc:hsqldb:mem:test" />
-               <property name="username" value="sa" />
-               <property name="password" value="" />
-               <property name="suppressClose" value="true" />
-       </bean>
-
        <bean id="slcTemplates.sessionFactory.hibernateBasic" abstract="true"
                class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
                <property name="mappingResources">
@@ -64,15 +54,4 @@
                        value="classpath:/org/argeo/slc/hibernate/ehcache.xml" />
        </bean>
 
-       <bean id="slcDefault.sessionFactory.hibernateTestHSQL" parent="slcTemplates.sessionFactory.hibernateBasic">
-               <property name="dataSource" ref="slcDefault.dataSource.inMemoryTestHSQL" />
-               <property name="hibernateProperties">
-                       <value><![CDATA[
-                               hibernate.dialect=org.hibernate.dialect.HSQLDialect
-                               hibernate.hbm2ddl.auto=create
-                               hibernate.current_session_context_class=thread
-                       ]]></value>
-               </property>
-       </bean>
-
 </beans>
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.support.hibernate/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml b/runtime/org.argeo.slc.support.hibernate/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml
index de1ee349cfd655e0c3aeb1e5a628655bddb08f1d..191cc64420b86a8832611f79a2db9bf72b21ed1b 100644 (file)
--- a/runtime/org.argeo.slc.support.hibernate/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml
+++ b/runtime/org.argeo.slc.support.hibernate/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml
@@ -3,24 +3,39 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
-       <import\r
-               resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />\r
+       <import resource="classpath:/org/argeo/slc/hibernate/spring.xml" />\r
 \r
-       <bean id="sessionFactory"\r
-               parent="slcDefault.sessionFactory.hibernateTestHSQL">\r
+       <bean id="sessionFactory" parent="slcTemplates.sessionFactory.hibernateBasic">\r
+               <property name="dataSource" ref="dataSource" />\r
+               <property name="hibernateProperties">\r
+                       <value><![CDATA[\r
+                               hibernate.dialect=org.hibernate.dialect.HSQLDialect\r
+                               hibernate.hbm2ddl.auto=create\r
+                               hibernate.current_session_context_class=thread\r
+                       ]]></value>\r
+               </property>\r
        </bean>\r
 \r
-       <bean id="testResultDao"\r
-               parent="slcTemplates.dao.testResultDao">\r
+       <bean id="dataSource"\r
+               class="org.springframework.jdbc.datasource.SingleConnectionDataSource"\r
+               destroy-method="destroy" lazy-init="true">\r
+               <property name="driverClassName" value="org.hsqldb.jdbcDriver" />\r
+               <property name="url" value="jdbc:hsqldb:mem:test" />\r
+               <property name="username" value="sa" />\r
+               <property name="password" value="" />\r
+               <property name="suppressClose" value="true" />\r
+       </bean>\r
+\r
+\r
+\r
+       <bean id="testResultDao" parent="slcTemplates.dao.testResultDao">\r
                <property name="sessionFactory" ref="sessionFactory" />\r
        </bean>\r
-       <bean id="testResultCollectionDao"\r
-               parent="slcTemplates.dao.testResultCollectionDao">\r
+       <bean id="testResultCollectionDao" parent="slcTemplates.dao.testResultCollectionDao">\r
                <property name="sessionFactory" ref="sessionFactory" />\r
        </bean>\r
 \r
-       <bean id="slcExecutionDao"\r
-               parent="slcTemplates.dao.slcExecutionDao">\r
+       <bean id="slcExecutionDao" parent="slcTemplates.dao.slcExecutionDao">\r
                <property name="sessionFactory" ref="sessionFactory" />\r
        </bean>\r
 </beans>
\ No newline at end of file