From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 28 Jun 2008 18:49:58 +0000 (+0000)
Subject: Improve transaction management
X-Git-Tag: argeo-slc-2.1.7~2726
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=4e448631b2b951187784070e6ad7bee87ea31e01;hp=5eb8718252d52b20c7f74696f70a16cb183806ba;p=gpl%2Fargeo-slc.git

Improve transaction management

git-svn-id: https://svn.argeo.org/slc/trunk@1316 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

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 21efb5d08..651ddb2d8 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
@@ -11,6 +11,7 @@
 
 	<import
 		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
+	<import resource="transaction.xml" />
 
 	<!--  Default data source -->
 	<bean
diff --git a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ws-servlet.xml b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ws-servlet.xml
index 794d97782..b6125df19 100644
--- a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ws-servlet.xml
+++ b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ws-servlet.xml
@@ -102,9 +102,8 @@
 	</bean>
 
 	<bean class="org.argeo.slc.ws.CustomSoapExceptionResolver" />
-
-	<!-- Transaction -->
-
+	
+	<!-- Web Services transactions -->
 	<aop:config>
 		<aop:pointcut id="epMethods"
 			expression="execution(* org.springframework.ws.server.endpoint.MessageEndpoint.invoke(..))" />
@@ -113,8 +112,7 @@
 
 	<tx:advice id="epAdvice" transaction-manager="transactionManager">
 		<tx:attributes>
-			<tx:method name="*" propagation="REQUIRES_NEW" />
+			<tx:method name="*" propagation="REQUIRED" />
 		</tx:attributes>
 	</tx:advice>
-
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/transaction.xml b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/transaction.xml
new file mode 100644
index 000000000..43cabb8ea
--- /dev/null
+++ b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/transaction.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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
+       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+	<!-- Transaction -->
+	<bean id="transactionManager"
+		class="org.springframework.orm.hibernate3.HibernateTransactionManager"
+		lazy-init="false">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+
+	<!-- DAO transactions -->
+	<aop:config>
+		<aop:pointcut id="daoProcessMethods"
+			expression="execution(* org.argeo.slc.dao.process.*.*(..))" />
+		<aop:advisor advice-ref="daoAdvice"
+			pointcut-ref="daoProcessMethods" />
+	</aop:config>
+
+	<aop:config>
+		<aop:pointcut id="daoTestMethods"
+			expression="execution(* org.argeo.slc.dao.test.*.*(..))" />
+		<aop:advisor advice-ref="daoAdvice"
+			pointcut-ref="daoTestMethods" />
+	</aop:config>
+
+	<aop:config>
+		<aop:pointcut id="daoTestTreeMethods"
+			expression="execution(* org.argeo.slc.dao.test.tree.*.*(..))" />
+		<aop:advisor advice-ref="daoAdvice"
+			pointcut-ref="daoTestTreeMethods" />
+	</aop:config>
+
+	<tx:advice id="daoAdvice"
+		transaction-manager="transactionManager">
+		<tx:attributes>
+			<tx:method name="get*" propagation="REQUIRED"
+				read-only="true" />
+			<tx:method name="list*" propagation="REQUIRED"
+				read-only="true" />
+			<tx:method name="*" propagation="REQUIRED" />
+		</tx:attributes>
+	</tx:advice>
+
+</beans>
\ No newline at end of file