Centralize 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 9ef1c433eea4cfe18b7fb1bde4a05c60701474bb..5c990249da3e09304d76e8b8c11aafa3b385fe9d 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,52 +1,10 @@
 <?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\r
-               resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />\r
+               resource="classpath:/org/argeo/slc/server/spring/servletContext.xml" />\r
 \r
-       <bean\r
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
-               <property name="locations">\r
-                       <value>WEB-INF/local.properties</value>\r
-               </property>\r
-               <property name="properties">\r
-                       <props>\r
-                               <prop key="${dataSourceBean}">\r
-                                       slcTemplates.dataSource.inMemoryTestHSQL\r
-                               </prop>\r
-                       </props>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="sessionFactory"\r
-               parent="slcTemplates.sessionFactory.hibernateBasic">\r
-               <property name="dataSource" ref="${dataSourceBean}" />\r
-               <property name="hibernateProperties">\r
-                       <value><![CDATA[\r
-                               hibernate.dialect=org.hibernate.dialect.HSQLDialect\r
-                               hibernate.hbm2ddl.auto=update\r
-                       ]]></value>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="persistentDataSource"\r
-               class="org.springframework.jdbc.datasource.SingleConnectionDataSource"\r
-               destroy-method="destroy">\r
-               <property name="driverClassName" value="org.hsqldb.jdbcDriver" />\r
-               <property name="url" value="${jdbcUrl}" />\r
-               <property name="username" value="sa" />\r
-               <property name="password" value="" />\r
-               <property name="suppressClose" value="true" />\r
-       </bean>\r
-\r
-       <bean id="testResultDao" parent="slcTemplates.dao.testResultDao">\r
-               <property name="sessionFactory" ref="sessionFactory" />\r
-       </bean>\r
-\r
-       <bean id="slcExecutionDao"\r
-               parent="slcTemplates.dao.slcExecutionDao">\r
-               <property name="sessionFactory" ref="sessionFactory" />\r
-       </bean>\r
 </beans>
\ No newline at end of file