From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 5 Jun 2008 16:58:16 +0000 (+0000)
Subject: Centralize configs
X-Git-Tag: argeo-slc-2.1.7~2827
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=3778a43d5f3dd5b80faab94a1f1d04d4e98cf575;p=gpl%2Fargeo-slc.git

Centralize configs

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

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 7214eed9c..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
@@ -7,38 +7,4 @@
 	<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>
 </beans>
\ No newline at end of file