Stabilize attachments and events

[gpl/argeo-slc.git] / server / org.argeo.slc.siteserver / bundles / org.argeo.slc.webapp.war / WEB-INF / applicationContext.xml

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 be36828d73d5080ee4c367162751d1619b639925..703e681a76d30c8b7dbd47307cef1c74e745b5e7 100644 (file)
--- 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