X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.server%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Fserver%2Fspring%2FservletContext.xml;h=0ea81004e0961c58dfb4bd4dd78fe8c42b409f2e;hb=166bc4734ed2777e94cc264ab1195a18bf6dda81;hp=c2428e2c2c15bfb5d4fd62dd4f753b8a577cfb5c;hpb=37ab16e966e94374d3f8458c20f67679129f3dbc;p=gpl%2Fargeo-slc.git

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 c2428e2c2..0ea81004e 100644
--- 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,7 +1,10 @@
 <?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"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xsi:schemaLocation="
+	 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 	default-lazy-init="true">
 
 	<import
@@ -18,8 +21,8 @@
 		</property>
 		<property name="properties">
 			<props>
-				<prop key="${sessionFactoryParentBean}">
-					slcDefault.sessionFactory.hibernateTestHSQL
+				<prop key="sessionFactoryParentBean">
+					slcServerDefault.sessionFactory.hibernateTestHSQL
 				</prop>
 			</props>
 		</property>
@@ -28,6 +31,20 @@
 
 	<bean id="sessionFactory" parent="${sessionFactoryParentBean}" />
 
+	<bean id="slcServerDefault.sessionFactory.hibernateTestHSQL"
+		parent="slcTemplates.sessionFactory.hibernateBasic">
+		<property name="dataSource"
+			ref="slcDefault.dataSource.inMemoryTestHSQL" />
+		<property name="hibernateProperties">
+			<value><![CDATA[
+				hibernate.dialect=org.hibernate.dialect.HSQLDialect
+				hibernate.hbm2ddl.auto=create
+				hibernate.current_session_context_class=thread
+				hibernate.generate_statistics=true
+			]]></value>
+		</property>
+	</bean>
+
 	<bean id="slcServerDefault.sessionFactory.persistentHSQL"
 		parent="slcTemplates.sessionFactory.hibernateBasic">
 		<property name="dataSource"
@@ -79,4 +96,10 @@
 		parent="slcTemplates.dao.slcExecutionDao">
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
+
+	<!-- Hibernate instrumentation -->
+	<bean id="osivInterceptor"
+		class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
 </beans>
\ No newline at end of file