X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2FapplicationContext.xml;h=5c990249da3e09304d76e8b8c11aafa3b385fe9d;hb=d337e16bbb1a04719caae3cbe721dbee5d06932c;hp=6e3f7899a29dc5f19c3377a23eb236f240b0c2d2;hpb=3f5c0ed838ca85f37f47606fe54f4b866a41af63;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 6e3f7899a..5c990249d 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,63 +1,10 @@
 <?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/server/spring/servletContext.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.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="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="treeSPathDao"
-		class="org.argeo.slc.hibernate.structure.tree.TreeSPathDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-	<bean id="treeSRegistryDao"
-		class="org.argeo.slc.hibernate.structure.tree.TreeSRegistryDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-	<bean id="testResultDao"
-		class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-	<bean id="slcExecutionDao"
-		class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
 </beans>
\ No newline at end of file