bpapez 2005/12/06 13:11:41 CET
Modified files:
core/src/webapp/WEB-INF/etc/jetspeed/conf/assembly
transaction.xml
Log:
add proper user transaction name as property
Revision Changes Path
1.4 +6 -3
jahia/core/src/webapp/WEB-INF/etc/jetspeed/conf/assembly/transaction.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/jetspeed/conf/assembly/transaction.xml.diff?r1=1.3&r2=1.4&f=h
Index: transaction.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/jetspeed/conf/assembly/transaction.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- transaction.xml 12 Aug 2005 15:43:09 -0000 1.3
+++ transaction.xml 6 Dec 2005 12:11:40 -0000 1.4
@@ -10,12 +10,15 @@
<bean id="transactionManager"
class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager"/>
<!-- Transaction manager that delegates to JTA (for a transactional
JNDI DataSource) -->
- <!--
- <bean id="transactionManager"
class="org.springframework.transaction.jta.JtaTransactionManager"/>
+ <!-- uncomment this to use JTA transactions and comment the other.
+ <bean id="transactionManager"
class="org.springframework.transaction.jta.JtaTransactionManager">
+ <property name="userTransactionName">
+ <value>java:comp/UserTransaction</value>
+ </property>
+ </bean>
-->
-
<!--
- A parent bean definition which is a base definition for
transaction proxies.
- It is markes as abstract, since it is never supposed to be
instantiated itself.
