From 9682296b62eacdbb264a778369ed163a55a02214 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 4 Jun 2008 15:11:01 +0000
Subject: [PATCH] Adapt to new SLC structure

git-svn-id: https://svn.argeo.org/slc/trunk@1188 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../exampleSlcAppli/conf/data.xml             | 90 +++----------------
 .../exampleSlcAppli/conf/slc.xml              |  1 -
 2 files changed, 13 insertions(+), 78 deletions(-)

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/data.xml b/org.argeo.slc.example/exampleSlcAppli/conf/data.xml
index 1bb1337af..7f9664d9d 100644
--- 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"?>
-<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">
-
-	<!-- Results -->
-	<bean id="dataSourceResults"
-		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
-		destroy-method="destroy">
-		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
-		<!-- <property name="url"
-			value="jdbc:hsqldb:file:${slc.workDir}/results/hsqldb/db;shutdown=true" />-->
-		<property name="url"
-			value="jdbc:hsqldb:mem:results" />
-		<property name="username" value="sa" />
-		<property name="password" value="" />
-		<property name="suppressClose" value="true" />
-	</bean>
-
-	<bean id="sessionFactoryResults"
-		class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource" ref="dataSourceResults" />
-		<property name="mappingResources">
-			<list>
-				<value>
-					org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/NumericTRId.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
-				</value>
-			</list>
-		</property>
-		<property name="hibernateProperties">
-			<value>
-				hibernate.dialect=org.hibernate.dialect.HSQLDialect
-				cache.provider_class=org.hibernate.cache.NoCacheProvider
-				cache.use_query_cache=false
-				cache.use_minimal_puts=false
-				max_fetch_depth=3
-				current_session_context_class=thread
-				hibernate.hbm2ddl.auto=create
-			</value>
-		</property>
-	</bean>
-
-	<bean id="testResultDao"
-		class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactoryResults" />
-	</bean>
-
-	<bean id="treeSPathDao"
-		class="org.argeo.slc.hibernate.structure.tree.TreeSPathDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactoryResults" />
-	</bean>
-
-	<bean id="treeSRegistryDao"
-		class="org.argeo.slc.hibernate.structure.tree.TreeSRegistryDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactoryResults" />
-		<property name="treeSPathDao" ref="treeSPathDao" />
-	</bean>
-
-
+<?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 c35c1be19..821739501 100644
--- 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"
 		class="org.argeo.slc.core.test.tree.htmlreport.FullHtmlTreeReport">
 		<property name="testResultDao" ref="testResultDao" />
-		<property name="treeSRegistryDao" ref="treeSRegistryDao" />
 		<property name="reportDir"
 			value="${slc.workDir}/results/report" />
 	</bean>
-- 
2.39.2