svn commit: r860585 - in /websites/staging/tomee/trunk: cgi-bin/ content/ content/containers-and-resources.html

[buildbot]

Author: buildbot
Date: Thu May  2 11:38:36 2013
New Revision: 860585

Log:
Staging update by buildbot for tomee

Modified:
    websites/staging/tomee/trunk/cgi-bin/   (props changed)
    websites/staging/tomee/trunk/content/   (props changed)
    websites/staging/tomee/trunk/content/containers-and-resources.html

Propchange: websites/staging/tomee/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May  2 11:38:36 2013
@@ -1 +1 @@
-1478279
+1478330

Propchange: websites/staging/tomee/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May  2 11:38:36 2013
@@ -1 +1 @@
-1478279
+1478330

Modified: websites/staging/tomee/trunk/content/containers-and-resources.html
==============================================================================
--- websites/staging/tomee/trunk/content/containers-and-resources.html 
(original)
+++ websites/staging/tomee/trunk/content/containers-and-resources.html Thu May  
2 11:38:36 2013
@@ -161,6 +161,33 @@
 </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>
@@ -417,7 +444,7 @@
 </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>