X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Forg.argeo.slc.siteserver%2Fbundles%2Forg.argeo.slc.server.hsqldb%2FMETA-INF%2Fspring%2Fhsqldb.xml;h=26f0a054d0be537f96568868c710f3d042c90529;hb=25faa15e49f30510b365ba75646128b7e5a74586;hp=0be5483c70c011e48e8f7cb704837a40fe6d2efb;hpb=0f26a1ac2596c4f949973028af21bc0f951b7b7a;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml
index 0be5483c7..26f0a054d 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml
@@ -8,9 +8,18 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
 	default-lazy-init="false">
 
-		<import
-		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml"
-		/>
+	<import
+		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
+
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+		<property name="locations">
+			<value>osgibundle:hsqldb.properties
+			</value>
+		</property>
+	</bean>
 
 	<bean id="sessionFactory" parent="slcTemplates.sessionFactory.hibernateBasic">
 		<property name="dataSource" ref="dataSource" />
@@ -24,9 +33,9 @@
 	</bean>
 
 	<bean id="dataSource" class="org.hsqldb.jdbc.jdbcDataSource">
-		<property name="database" value="jdbc:hsqldb:mem:test"/>
-		<property name="user" value="sa"/>
-		<property name="password" value=""/>
-		
+		<property name="database" value="${slc.server.hsqldb.url}" />
+		<property name="user" value="sa" />
+		<property name="password" value="" />
+
 	</bean>
 </beans>
\ No newline at end of file