Adapt to new SLC structure

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

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/data.xml b/org.argeo.slc.example/exampleSlcAppli/conf/data.xml
index 1bb1337af50a37e4e5cf204c175b5566e278d238..7f9664d9d8ca1e200ff0b0755f7e4c9aee704247 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/conf/data.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/data.xml
@@ -1,78 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       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.0.xsd">\r
-\r
-       <!-- Results -->\r
-       <bean id="dataSourceResults"\r
-               class="org.springframework.jdbc.datasource.SingleConnectionDataSource"\r
-               destroy-method="destroy">\r
-               <property name="driverClassName" value="org.hsqldb.jdbcDriver" />\r
-               <!-- <property name="url"\r
-                       value="jdbc:hsqldb:file:${slc.workDir}/results/hsqldb/db;shutdown=true" />-->\r
-               <property name="url"\r
-                       value="jdbc:hsqldb:mem:results" />\r
-               <property name="username" value="sa" />\r
-               <property name="password" value="" />\r
-               <property name="suppressClose" value="true" />\r
-       </bean>\r
-\r
-       <bean id="sessionFactoryResults"\r
-               class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">\r
-               <property name="dataSource" ref="dataSourceResults" />\r
-               <property name="mappingResources">\r
-                       <list>\r
-                               <value>\r
-                                       org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml\r
-                               </value>\r
-                               <value>\r
-                                       org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml\r
-                               </value>\r
-                               <value>\r
-                                       org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml\r
-                               </value>\r
-                               <value>\r
-                                       org/argeo/slc/hibernate/test/NumericTRId.hbm.xml\r
-                               </value>\r
-                               <value>\r
-                                       org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml\r
-                               </value>\r
-                               <value>\r
-                                       org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml\r
-                               </value>\r
-                               <value>\r
-                                       org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml\r
-                               </value>\r
-                       </list>\r
-               </property>\r
-               <property name="hibernateProperties">\r
-                       <value>\r
-                               hibernate.dialect=org.hibernate.dialect.HSQLDialect\r
-                               cache.provider_class=org.hibernate.cache.NoCacheProvider\r
-                               cache.use_query_cache=false\r
-                               cache.use_minimal_puts=false\r
-                               max_fetch_depth=3\r
-                               current_session_context_class=thread\r
-                               hibernate.hbm2ddl.auto=create\r
-                       </value>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="testResultDao"\r
-               class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">\r
-               <property name="sessionFactory" ref="sessionFactoryResults" />\r
-       </bean>\r
-\r
-       <bean id="treeSPathDao"\r
-               class="org.argeo.slc.hibernate.structure.tree.TreeSPathDaoHibernate">\r
-               <property name="sessionFactory" ref="sessionFactoryResults" />\r
-       </bean>\r
-\r
-       <bean id="treeSRegistryDao"\r
-               class="org.argeo.slc.hibernate.structure.tree.TreeSRegistryDaoHibernate">\r
-               <property name="sessionFactory" ref="sessionFactoryResults" />\r
-               <property name="treeSPathDao" ref="treeSPathDao" />\r
-       </bean>\r
-\r
-\r
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+       <import
+               resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
+
+       <bean id="testResultDao"
+               class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">
+               <property name="sessionFactory"
+                       ref="slcDefault.sessionFactory.hibernateTestHSQL" />
+       </bean>
 </beans>
\ No newline at end of file

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/slc.xml b/org.argeo.slc.example/exampleSlcAppli/conf/slc.xml
index c35c1be192173d7c14e64453303528f3bf608fcc..821739501b43ce92003199c436aadf50c7d42448 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/conf/slc.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/slc.xml
@@ -52,7 +52,6 @@
        <bean id="report"\r
                class="org.argeo.slc.core.test.tree.htmlreport.FullHtmlTreeReport">\r
                <property name="testResultDao" ref="testResultDao" />\r
-               <property name="treeSRegistryDao" ref="treeSRegistryDao" />\r
                <property name="reportDir"\r
                        value="${slc.workDir}/results/report" />\r
        </bean>\r