svn commit: r962055 - in /websites/staging/deltaspike/trunk/content: ./ documentation/jpa.html

[buildbot]

Author: buildbot
Date: Mon Aug 17 01:04:18 2015
New Revision: 962055

Log:
Staging update by buildbot for deltaspike

Modified:
    websites/staging/deltaspike/trunk/content/   (props changed)
    websites/staging/deltaspike/trunk/content/documentation/jpa.html

Propchange: websites/staging/deltaspike/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Aug 17 01:04:18 2015
@@ -1 +1 @@
-1695957
+1696186

Modified: websites/staging/deltaspike/trunk/content/documentation/jpa.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/documentation/jpa.html (original)
+++ websites/staging/deltaspike/trunk/content/documentation/jpa.html Mon Aug 17 
01:04:18 2015
@@ -312,7 +312,7 @@ table.CodeRay td.code>pre{padding:0}
 <div class="sect2">
 <h3 id="_2_enable_the_transaction_interceptor">2. Enable the Transaction 
Interceptor</h3>
 <div class="paragraph">
-<p>For CDI 1.0 (or DeltaSpike v1.1.0 and earlier together with CDI 1.1+), you 
must enable the transaction interceptor in the project <code>beans.xml</code> 
file:</p>
+<p>If you are using CDI 1.0 or CDI 1.1+ with DeltaSpike v1.1.0 and earlier, 
you must enable the transaction interceptor in the project 
<code>beans.xml</code> file:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -862,6 +862,12 @@ in the beans.xml which is called
 </div>
 </div>
 <div class="paragraph">
+<p>Alternatively, you may expect that your transactions are started at a 
higher level, e.g. you&#8217;re exposing a REST API
+and the endpoints themselves are either <code>@Transactional</code> or 
Stateless session beans, either with container managed
+Transactions, you would use 
<code>org.apache.deltaspike.jpa.impl.transaction.ContainerManagedTransactionStrategy</code>.
  This
+is the strategy to use if you are leveraging <code>@PersistenceContext</code> 
to inject your <code>EntityManager</code>.</p>
+</div>
+<div class="paragraph">
 <p>If you have multiple persistence units and you have to use both
 transaction types or the settings for development have to be different
 than the production settings, you can use
@@ -876,11 +882,11 @@ instead.</p>
 </td>
 <td class="content">
 In case of some versions of Weld (or OpenWebBeans in BDA mode), you have
-to configure it as global-alternative instead of an 
<code>&lt;alternatives&gt;</code> in
-beans.xml. That means you have to add, for example,
+to configure it as a <a href="spi.html#GlobalAlternative">global 
alternative</a> instead of an <code>alternative</code> in
+<code>beans.xml</code>. That means you have to add, for example,
 
<code>globalAlternatives.org.apache.deltaspike.jpa.spi.transaction.TransactionStrategy
 
=org.apache.deltaspike.jpa.impl.transaction.BeanManagedUserTransactionStrategy</code>
-to <code>/META-INF/apache-deltaspike.properties</code>
+to <code>/META-INF/apache-deltaspike.properties</code>.
 </td>
 </tr>
 </table>