From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 24 Apr 2008 10:08:06 +0000 (+0000)
Subject: Add local persistent data source
X-Git-Tag: argeo-slc-2.1.7~2995
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=3f5c0ed838ca85f37f47606fe54f4b866a41af63;p=gpl%2Fargeo-slc.git

Add local persistent data source

git-svn-id: https://svn.argeo.org/slc/trunk@1045 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 7e429ad6b..6e3f7899a 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
@@ -5,10 +5,42 @@
 
 	<import resource="classpath:/org/argeo/slc/spring/templates.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.hibernateTestHSQL">
+		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" />
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties
new file mode 100644
index 000000000..17ff29cdd
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties
@@ -0,0 +1,11 @@
+# Rename this file to local.properties
+
+# For in memory database switch following lines
+#dataSourceBean=slcTemplates.dataSource.inMemoryTestHSQL
+dataSourceBean=persistentDataSource
+
+# URL of the peristent database
+jdbcUrl=jdbc:hsqldb:file:/<path to a directory>/<db name>;shutdown=true
+# Under Windows use the following form (with /!)
+#jdbcUrl=jdbc:hsqldb:file:/C:/dev/test/dbSlc/db;shutdown=true
+