bpapez 2005/12/06 13:12:13 CET
Modified files:
core/src/webapp/WEB-INF/etc/spring
applicationcontext-hibernate.xml
Log:
* add setting of hibernate.transaction.manager_lookup_class
* change the UserTransaction name
* add nestedTransactionAllowed=false for JTA
Revision Changes Path
1.13 +6 -2
jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.xml.diff?r1=1.12&r2=1.13&f=h
Index: applicationcontext-hibernate.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- applicationcontext-hibernate.xml 23 Nov 2005 17:44:16 -0000 1.12
+++ applicationcontext-hibernate.xml 6 Dec 2005 12:12:13 -0000 1.13
@@ -130,6 +130,7 @@
<prop key="hibernate.query.substitutions">true 1, false
0</prop>
<!-- uncomment this to use JTA transactions.
<prop
key="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</prop>
+ <prop key="hibernate.transaction.manager_lookup_class">
org.hibernate.transaction.JOTMTransactionManagerLookup</prop>
-->
</props>
</property>
@@ -142,11 +143,14 @@
</property>
</bean>
- <!-- Uncomment this to use JOTM Transaction Manager with Tomcat
+ <!-- Uncomment this to use JOTM Transaction Manager with Tomcat and
comment the other
<bean id="transactionManager"
class="org.springframework.transaction.jta.JtaTransactionManager">
<property name="userTransactionName">
- <value>java:comp/env/UserTransaction</value>
+ <value>java:comp/UserTransaction</value>
</property>
+ <property name="nestedTransactionAllowed">
+ <value>@NESTED_TRANSACTION_ALLOWED@</value>
+ </property>
</bean>
-->
