Centralize configs

git-svn-id: https://svn.argeo.org/slc/trunk@1215 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml
index eafe27e473ec72ae1aca27e29addff8c0738bae2..c2428e2c2c15bfb5d4fd62dd4f753b8a577cfb5c 100644 (file)
--- a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml
+++ b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml
@@ -1,38 +1,82 @@
-<?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.5.xsd"\r
-       default-lazy-init="true">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />\r
-\r
-       <!-- Services -->\r
-       <bean id="testManagerService"\r
-               class="org.argeo.slc.services.test.impl.TestManagerServiceImpl">\r
-               <constructor-arg ref="testResultDao" />\r
-               <constructor-arg ref="testRunDescriptorDao" />\r
-               <constructor-arg ref="slcExecutionDao" />\r
-               <constructor-arg ref="testResultCollectionDao" />\r
-       </bean>\r
-\r
-       <!-- DAOs -->\r
-       <bean id="testResultDao" parent="slcTemplates.dao.testResultDao">\r
-               <property name="sessionFactory" ref="sessionFactory" />\r
-       </bean>\r
-\r
-       <bean id="testResultCollectionDao"\r
-               parent="slcTemplates.dao.testResultCollectionDao">\r
-               <property name="sessionFactory" ref="sessionFactory" />\r
-       </bean>\r
-\r
-       <bean id="testRunDescriptorDao"\r
-               parent="slcTemplates.dao.testRunDescriptorDao">\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
+<?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.5.xsd"
+       default-lazy-init="true">
+
+       <import
+               resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
+
+       <!--  Default data source -->
+       <bean
+               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
+               lazy-init="false">
+               <property name="ignoreResourceNotFound" value="true" />
+               <property name="ignoreUnresolvablePlaceholders" value="true" />
+               <property name="locations">
+                       <value>WEB-INF/local.properties</value>
+               </property>
+               <property name="properties">
+                       <props>
+                               <prop key="${sessionFactoryParentBean}">
+                                       slcDefault.sessionFactory.hibernateTestHSQL
+                               </prop>
+                       </props>
+               </property>
+       </bean>
+
+
+       <bean id="sessionFactory" parent="${sessionFactoryParentBean}" />
+
+       <bean id="slcServerDefault.sessionFactory.persistentHSQL"
+               parent="slcTemplates.sessionFactory.hibernateBasic">
+               <property name="dataSource"
+                       ref="slcServerDefault.datasource.persistentHSQL" />
+               <property name="hibernateProperties">
+                       <value><![CDATA[
+                               hibernate.dialect=org.hibernate.dialect.HSQLDialect
+                               hibernate.hbm2ddl.auto=update
+                               hibernate.current_session_context_class=thread
+                       ]]></value>
+               </property>
+       </bean>
+
+       <bean id="slcServerDefault.datasource.persistentHSQL"
+               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>
+
+       <!-- Services -->
+       <bean id="testManagerService"
+               class="org.argeo.slc.services.test.impl.TestManagerServiceImpl">
+               <constructor-arg ref="testResultDao" />
+               <constructor-arg ref="testRunDescriptorDao" />
+               <constructor-arg ref="slcExecutionDao" />
+               <constructor-arg ref="testResultCollectionDao" />
+       </bean>
+
+       <!-- DAOs -->
+       <bean id="testResultDao" parent="slcTemplates.dao.testResultDao">
+               <property name="sessionFactory" ref="sessionFactory" />
+       </bean>
+
+       <bean id="testResultCollectionDao"
+               parent="slcTemplates.dao.testResultCollectionDao">
+               <property name="sessionFactory" ref="sessionFactory" />
+       </bean>
+
+       <bean id="testRunDescriptorDao"
+               parent="slcTemplates.dao.testRunDescriptorDao">
+               <property name="sessionFactory" ref="sessionFactory" />
+       </bean>
+
+       <bean id="slcExecutionDao"
+               parent="slcTemplates.dao.slcExecutionDao">
+               <property name="sessionFactory" ref="sessionFactory" />
+       </bean>
 </beans>
\ No newline at end of file