X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2FapplicationContext.xml;h=7727629dc665e4615c91825b1951ebbf6635f01d;hb=a9b5d9077e01c0e07b986dd77fed5273daa49d48;hp=7e429ad6b6f979ee150720a683bb4b9691aee503;hpb=38087bceeb3d6bd73fb6942c9d7bfd6a7d0abca5;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 7e429ad6b..7727629dc 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -1,31 +1,58 @@
 <?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">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+	default-lazy-init="true">
 
-	<import resource="classpath:/org/argeo/slc/spring/templates.xml" />
+	<import
+		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
+
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="locations">
+			<value>WEB-INF/local.properties</value>
+		</property>
+		<property name="properties">
+			<props>
+				<prop key="${dataSourceBean}">
+					slcTemplates.dataSource.inMemoryTestHSQL
+				</prop>
+			</props>
+		</property>
+	</bean>
 
 	<bean id="sessionFactory"
-		parent="slcTemplates.sessionFactory.hibernateTestHSQL">
+		parent="slcTemplates.sessionFactory.hibernateBasic">
+		<property name="dataSource" ref="${dataSourceBean}" />
+		<property name="hibernateProperties">
+			<value><![CDATA[
+				hibernate.dialect=org.hibernate.dialect.HSQLDialect
+				hibernate.hbm2ddl.auto=update
+			]]></value>
+		</property>
 	</bean>
 
-	<bean id="treeSPathDao"
-		class="org.argeo.slc.hibernate.structure.tree.TreeSPathDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactory" />
+	<bean id="persistentDataSource"
+		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
+		destroy-method="destroy">
+		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
+		<property name="url" value="${jdbcUrl}" />
+		<property name="username" value="sa" />
+		<property name="password" value="" />
+		<property name="suppressClose" value="true" />
 	</bean>
 
-	<bean id="treeSRegistryDao"
-		class="org.argeo.slc.hibernate.structure.tree.TreeSRegistryDaoHibernate">
+	<bean id="testResultDao" parent="slcTemplates.dao.testResultDao">
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
 
-	<bean id="testResultDao"
-		class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">
+	<bean id="testRunDescriptorDao"
+		parent="slcTemplates.dao.testRunDescriptorDao">
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
 
 	<bean id="slcExecutionDao"
-		class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate">
+		parent="slcTemplates.dao.slcExecutionDao">
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
 </beans>
\ No newline at end of file