X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fsrc%2Ftest%2Fslc%2Fconf%2Fdata.xml;h=4ab0629fccc51dc7ae36224a78d03ae3fb6f90b7;hb=b5c4e0c9c2fcf788a56d6ce72989fe15182e057d;hp=4287091333b0f44e9e86b83b1b402fddee04f429;hpb=9eb5d8493deed66f11248550fe5ec2202151846f;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/src/test/slc/conf/data.xml b/org.argeo.slc/src/test/slc/conf/data.xml
index 428709133..4ab0629fc 100644
--- a/org.argeo.slc/src/test/slc/conf/data.xml
+++ b/org.argeo.slc/src/test/slc/conf/data.xml
@@ -5,13 +5,16 @@
 
 	<!-- Results -->
 	<bean id="dataSourceResults"
-		class="org.springframework.jdbc.datasource.DriverManagerDataSource"
-		>
+		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:file:${slc.workDir}/results/hsqldb/db;shutdown=true" />
+			value="jdbc:hsqldb:mem:results" />
 		<property name="username" value="sa" />
 		<property name="password" value="" />
+		<property name="suppressClose" value="true" />
 	</bean>
 
 	<bean id="sessionFactoryResults"
@@ -19,6 +22,15 @@
 		<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>
@@ -26,10 +38,10 @@
 					org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
 				</value>
 				<value>
-					org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
+					org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
 				</value>
 				<value>
-					org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
+					org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
 				</value>
 			</list>
 		</property>
@@ -41,7 +53,7 @@
 				cache.use_minimal_puts=false
 				max_fetch_depth=3
 				current_session_context_class=thread
-				hibernate.hbm2ddl.auto=update
+				hibernate.hbm2ddl.auto=create
 			</value>
 		</property>
 	</bean>
@@ -51,11 +63,15 @@
 		<property name="sessionFactory" ref="sessionFactoryResults" />
 	</bean>
 
-	<bean id="report"
-		class="org.argeo.slc.core.test.tree.FullHtmlTreeReport">
-		<property name="testResultDao" ref="testResultDao" />
-		<property name="reportDir" value="${slc.workDir}/results/report" />
+	<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" />
+	</bean>
+
+
 </beans>
\ No newline at end of file