Centralize server spring configs

[gpl/argeo-slc.git] / org.argeo.slc.webapp / src / main / webapp / WEB-INF / applicationContext.xml

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 0177380d39e2465bae432eff390685bef4695615..7214eed9c35ad96dbab88a014e924c49b92ff66b 100644 (file)
--- 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,9 +1,11 @@
 <?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
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
+       default-lazy-init="true">\r
 \r
-       <import resource="classpath:/org/argeo/slc/spring/templates.xml" />\r
+       <import\r
+               resource="classpath:/org/argeo/slc/server/spring/servletContext.xml" />\r
 \r
        <bean\r
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
@@ -39,14 +41,4 @@
                <property name="password" value="" />\r
                <property name="suppressClose" value="true" />\r
        </bean>\r
-\r
-       <bean id="testResultDao"\r
-               class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">\r
-               <property name="sessionFactory" ref="sessionFactory" />\r
-       </bean>\r
-\r
-       <bean id="slcExecutionDao"\r
-               class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate">\r
-               <property name="sessionFactory" ref="sessionFactory" />\r
-       </bean>\r
 </beans>
\ No newline at end of file