svn commit: r1478330 - /tomee/site/trunk/content/containers-and-resources.mdtext

[jl...@apache.org]

Author: jlmonteiro
Date: Thu May  2 11:35:00 2013
New Revision: 1478330

URL: http://svn.apache.org/r1478330
Log:
Thanks James Green!

Modified:
    tomee/site/trunk/content/containers-and-resources.mdtext

Modified: tomee/site/trunk/content/containers-and-resources.mdtext
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/containers-and-resources.mdtext?rev=1478330&r1=1478329&r2=1478330&view=diff
==============================================================================
--- tomee/site/trunk/content/containers-and-resources.mdtext (original)
+++ tomee/site/trunk/content/containers-and-resources.mdtext Thu May  2 11:35:00 2013
@@ -28,6 +28,28 @@ Title: Containers and Resources
 </tbody></table>
 </div>
 
+<p><a name="ContainersandResources-TransactionManager"></a></p>
+<h2><a name="ContainersandResources-TxMgr"></a>TransactionManager</h2>
+<p>Declarable in tomee.xml via</p>
+<div style="border-width: 1px;" class="code panel"><div class="codeContent panelContent">
+<pre class="code-xml"><span class="code-tag">&lt;TransactionManager type=<span class="code-quote">"javax.transaction.TransactionManager"</span>&gt;</span>
+<span class="code-tag">&lt;/TransactionManager&gt;</span>
+</pre>
+</div></div>
+<p>Supports the following properties</p>
+<div class="table-wrap">
+<table class="confluenceTable"><tbody>
+<tr>
+<th > Property Name </th>
+<th > Description </th>
+</tr>
+<tr>
+<td > defaultTransactionTimeoutSeconds </td>
+<td > Default value is <em>10 minutes</em>.</td>
+</tr>
+</tbody></table>
+</div>
+
 
 <p><a name="ContainersandResources-DefaultBMPContainercontainer"></a></p>
 <h2><a name="ContainersandResources-BMPENTITY"></a>BMP_ENTITY</h2>
@@ -253,7 +275,7 @@ Title: Containers and Resources
 </tr>
 <tr>
 <td > TestOnBorrow </td>
-<td > If true connections will be validated before being returned<br class="atl-forced-newline"> from the pool. If the validation fails, the connection is<br class="atl-forced-newline"> destroyed, and a new conection will be retrieved from the<br class="atl-forced-newline"> pool (and validated).<br class="atl-forced-newline"> <br class="atl-forced-newline"> NOTE - for a true value to have any effect, the<br class="atl-forced-newline"> ValidationQuery parameter must be set.<br class="atl-forced-newline"> <br class="atl-forced-newline"> Default value is <em>true</em>.</td>
+<td > If true connections will be validated before being borrowed<br class="atl-forced-newline"> from the pool. If the validation fails, the connection is<br class="atl-forced-newline"> destroyed, and a new conection will be retrieved from the<br class="atl-forced-newline"> pool (and validated).<br class="atl-forced-newline"> <br class="atl-forced-newline"> NOTE - for a true value to have any effect, the<br class="atl-forced-newline"> ValidationQuery parameter must be set.<br class="atl-forced-newline"> <br class="atl-forced-newline"> Default value is <em>true</em>.</td>
 </tr>
 <tr>
 <td > TestOnReturn </td>