X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Forg.argeo.slc.siteserver%2Fbundles%2Forg.argeo.slc.webapp.war%2FWEB-INF%2FapplicationContext.xml;h=703e681a76d30c8b7dbd47307cef1c74e745b5e7;hb=25faa15e49f30510b365ba75646128b7e5a74586;hp=be36828d73d5080ee4c367162751d1619b639925;hpb=0f26a1ac2596c4f949973028af21bc0f951b7b7a;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
index be36828d7..703e681a7 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
@@ -13,8 +13,7 @@
 
 	<import resource="osgi.xml" />
 
-	<!--
-		Hibernate instrumentation-->
+	<!-- Hibernate instrumentation-->
 	<bean id="osivInterceptor"
 		class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
 		<property name="sessionFactory" ref="sessionFactory" />
@@ -26,14 +25,20 @@
 		class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
 		lazy-init="false">
 		<property name="contextOverride" value="true" />
-		<property name="properties">
-			<props>
-				<prop key="sessionFactoryParentBean">
-					slcServerDefault.sessionFactory.HSQL
-                </prop>
-			</props>
-		</property>
 		<property name="ignoreUnresolvablePlaceholders" value="true" />
 	</bean>
 
+	<!-- Web Services transactions -->
+	<aop:config>
+		<aop:pointcut id="epMethods"
+			expression="execution(* org.springframework.web.servlet.mvc.Controller.handleRequest(..))" />
+		<aop:advisor advice-ref="epAdvice" pointcut-ref="epMethods" />
+	</aop:config>
+
+	<tx:advice id="epAdvice" transaction-manager="hibernateTransactionManager">
+		<tx:attributes>
+			<tx:method name="*" propagation="REQUIRED" />
+		</tx:attributes>
+	</tx:advice>
+
 </beans>
\ No newline at end of file