bpapez 2005/12/06 13:12:06 CET
Modified files:
core/src/conf/metadata jahia-tomcat5.5.xml
Log:
- add resource for nontransactional DataSource: jdbc/jetspeedNonTx
- for UserTransaction use ResourceLink (Resource should be configured in
server.xml)
Revision Changes Path
1.5 +11 -5 jahia/core/src/conf/metadata/jahia-tomcat5.5.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/metadata/jahia-tomcat5.5.xml.diff?r1=1.4&r2=1.5&f=h
Index: jahia-tomcat5.5.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/metadata/jahia-tomcat5.5.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jahia-tomcat5.5.xml 23 Nov 2005 17:44:09 -0000 1.4
+++ jahia-tomcat5.5.xml 6 Dec 2005 12:12:06 -0000 1.5
@@ -5,13 +5,19 @@
<Resource name="jdbc/jetspeed" auth="Container"
factory="org.apache.commons.dbcp.BasicDataSourceFactory"
type="javax.sql.DataSource" username="@USERNAME@"
password="@PASSWORD@"
- driverClassName="@DRIVER@" url="@URL@" defaultAutoCommit="false"
+ driverClassName="@DRIVER@" url="@URL@" defaultAutoCommit="false"
maxActive="100" maxIdle="30" maxWait="10000"/>
+ <Resource name="jdbc/jetspeedNonTx" auth="Container"
+ factory="org.apache.commons.dbcp.BasicDataSourceFactory"
+ type="javax.sql.DataSource" username="@USERNAME@"
password="@PASSWORD@"
+ driverClassName="@DRIVER@" url="@URL@" defaultAutoCommit="false"
+ maxActive="20" maxIdle="30" maxWait="10000"/>
+
+ <!-- Resource configuration for UserTransaction use JOTM -->
<!--
- <Resource name="UserTransaction" auth="Container"
type="javax.transaction.UserTransaction"
- factory="org.objectweb.jotm.UserTransactionFactory"
- jotm.timeout="60"/>
+ <ResourceLink name="UserTransaction"
+ global="UserTransaction"
+ type="javax.transaction.UserTransaction"/>
-->
-
</Context>
