X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fbundles%2Forg.argeo.slc.server.hibernate%2FMETA-INF%2Fspring%2Ftransaction.xml;h=7d03b64e1bb9e32c3200034a733546116797957f;hb=25faa15e49f30510b365ba75646128b7e5a74586;hp=7e6d0ad5c17b2e00b1762d1ddb786430ad609449;hpb=0f26a1ac2596c4f949973028af21bc0f951b7b7a;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml
index 7e6d0ad5c..7d03b64e1 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml
@@ -8,7 +8,7 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
 	<!-- Transaction -->
-	<bean id="transactionManager"
+	<bean id="hibernateTransactionManager"
 		class="org.springframework.orm.hibernate3.HibernateTransactionManager"
 		lazy-init="false">
 		<property name="sessionFactory" ref="sessionFactory" />
@@ -39,14 +39,14 @@
 		<aop:advisor advice-ref="daoAdvice" pointcut-ref="daoTestTreeMethods" />
 	</aop:config>
 
-	<tx:advice id="daoAdvice" transaction-manager="transactionManager">
+	<tx:advice id="daoAdvice" transaction-manager="hibernateTransactionManager">
 		<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>
-<!-- 
+
 	<aop:config>
 		<aop:pointcut id="pointcut.services.allMethods"
 			expression="execution(* org.argeo.slc.services.*.*.*(..))" />
@@ -55,10 +55,10 @@
 	</aop:config>
 
 	<tx:advice id="advice.allMethodsRequired"
-		transaction-manager="transactionManager">
+		transaction-manager="hibernateTransactionManager">
 		<tx:attributes>
 			<tx:method name="*" propagation="REQUIRED" />
 		</tx:attributes>
 	</tx:advice>
- -->
+
 </beans>
\ No newline at end of file