You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by bu...@apache.org on 2011/07/12 20:06:36 UTC

svn commit: r792601 [46/49] - /websites/staging/openejb/trunk/content/

Modified: websites/staging/openejb/trunk/content/tomcat.html
==============================================================================
--- websites/staging/openejb/trunk/content/tomcat.html (original)
+++ websites/staging/openejb/trunk/content/tomcat.html Tue Jul 12 18:06:32 2011
@@ -152,7 +152,7 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="Tomcat-Introduction">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+          <p><a name="Tomcat-Introduction"></a></p>
 
 <h1>Introduction</h1>
 
@@ -163,7 +163,7 @@ to Servlets, including:</p>
 <li>@Annotations
 <em>* @Resource
 <em></em> @PersistenceUnit
-<em></em> @PersistenceConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t
+<em></em> @PersistenceContext
 *</em> @EJB</li>
 <li>JPA - Java Persistence Architecture</li>
 <li>JMS - Java Messaging Service</li>
@@ -183,98 +183,98 @@ is refered to as <a href="openejb:collap
 one archive and share the same classloader.</p>
 
 <p><em>Requirements:</em>
- * OpenEJB 3.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">
- * Tomcat 6.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> or 5.5
+ * OpenEJB 3.x
+ * Tomcat 6.x or 5.5
  * Java 1.5 or 1.6</p>
 
-<p><a name="Tomcat-{anchor:quickinstructions}InstallationfortheImpatient">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Tomcat-{anchor:quickinstructions}InstallationfortheImpatient"></a></p>
 
 <h1>{anchor:quick instructions}Installation for the Impatient</h1>
 
-<p>Assuming you have a <a href="tomcat-installation.html">normal working Tomcat 6.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> or 5.5 installation</a>
+<p>Assuming you have a <a href="tomcat-installation.html">normal working Tomcat 6.x or 5.5 installation</a>
 :</p>
 
 <ol>
 <li>Download <a href="openejb:download.html">openejb.war</a></li>
-<li>Copy openejb.war to ${catalina.base}<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">webapps<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb.war (Note: the
+<li>Copy openejb.war to ${catalina.base}/webapps/openejb.war (Note: the
 file <em>must</em> be named openejb.war)</li>
 <li>Start Tomcat if it is not already running</li>
-<li>(optional) Visit [http:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">localhost:8080<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">installer](http:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" 
 border="0">localhost:8080<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">installer)
+<li>(optional) Visit <a href="http://localhost:8080/openejb/installer">http://localhost:8080/openejb/installer</a>
 and click the 'install' button</li>
 </ol>
 
-<p><a name="Tomcat-E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples,TutorialsandTests">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Tomcat-Examples,TutorialsandTests"></a></p>
 
-<h1>E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples, Tutorials and Tests</h1>
+<h1>Examples, Tutorials and Tests</h1>
 
-<p><a name="Tomcat-ejb-e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples.war">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Tomcat-ejb-examples.war"></a></p>
 
-<h2>ejb-e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples.war</h2>
+<h2>ejb-examples.war</h2>
 
-<p>See the webapps<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">ejb-e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> directory in the <a href="openejb:download.html">openejb-e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples zip</a>
+<p>See the webapps/ejb-examples/ directory in the <a href="openejb:download.html">openejb-examples zip</a>
 .</p>
 
-<p><a name="Tomcat-{anchor:problems}Problems?">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Tomcat-{anchor:problems}Problems?"></a></p>
 
 <h1>{anchor:problems} Problems?</h1>
 
-<p><a name="Tomcat-HTTPStatus403">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Tomcat-HTTPStatus403"></a></p>
 
 <h2>HTTP Status 403</h2>
 
 <p>Did you get a "HTTP Status 403" error page containing the description
-"Access to the specified resource () has been forbidden." when visiting [http:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">localhost:8080<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb](http:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">localhost:8080<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/che
 ck.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb)
+"Access to the specified resource () has been forbidden." when visiting <a href="http://localhost:8080/openejb">http://localhost:8080/openejb</a>
 ?</p>
 
 <p>The openejb.war is protected by a Tomcat valve that restricts access to the
 application to the computer on which Tomcat is running.  If your browser is
 running on the same computer as Tomcat, try accessing OpenEJB using this
-link instead [http:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">127.0.0.1:8080<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb](http:<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">127.0.0.1:8080<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" bor
 der="0">openejb)
+link instead <a href="http://127.0.0.1:8080/openejb">http://127.0.0.1:8080/openejb</a>
 .</p>
 
 <p>If you want to access the openejb.war from another computer, you will need
 to either remove the valve, or modify the IP list in the valve declaration.</p>
 
 <p>The easiest way to remove the valve it to simply delete the
-webapps<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">META-INF<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">conte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml file and the webapps<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">o
 penejb.war file
+webapps/openejb/META-INF/context.xml file and the webapps/openejb.war file
 <em>while Tomcat is stopped</em>.  Warning that Tomcat keeps a copy of all
-conte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml files under conf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Catalina<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">localhost<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><appname>.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">
 ml, so you may
-need to delete the conf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Catalina<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">localhost<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml file as well.  The
+context.xml files under conf/Catalina/localhost/<appname>.xml, so you may
+need to delete the conf/Catalina/localhost/openejb.xml file as well.  The
 openejb.war file must be removed because some versions of Tomcat will use
-the conte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml file packed in the openejb.war file regardless of what is
+the context.xml file packed in the openejb.war file regardless of what is
 in the unpacked directory.</p>
 
-<p><a name="Tomcat-DuplicateDeploymentIdE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception:">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Tomcat-DuplicateDeploymentIdException:"></a></p>
 
-<h2>DuplicateDeploymentIdE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception:</h2>
+<h2>DuplicateDeploymentIdException:</h2>
 
 <p>If you try to deploy the same ejb in two different web applications, then
-you will get the following e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception (in conf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb.log):</p>
+you will get the following exception (in conf/openejb.log):</p>
 
-<pre><code>org.apache.openejb.DuplicateDeploymentIdE&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception: Application cannot be
+<pre><code>org.apache.openejb.DuplicateDeploymentIdException: Application cannot be
 </code></pre>
 
 <p>deployed as it contains deployment-ids which are in use: </p>
 
-<p>To fi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> the issue, do the following:
+<p>To fix the issue, do the following:
 1. Create a file named system.properties under the conf directory
 1. Add the following to the system.properties file and save</p>
 
-<pre><code>openejb.deploymentId.format={moduleId}&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;{ejbName}
+<pre><code>openejb.deploymentId.format={moduleId}/{ejbName}
 </code></pre>
 
-<p><a name="Tomcat-java.lang.OutOfMemoryError:PermGenspace">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Tomcat-java.lang.OutOfMemoryError:PermGenspace"></a></p>
 
 <h2>java.lang.OutOfMemoryError: PermGen space</h2>
 
 <p>By default, the JVM starts with a small PermGen. Tomcat does not increase
-this limit, so you may encounter this e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception by the time Tomcat deploys
-and e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecutes your application. If you get this e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception, you should
+this limit, so you may encounter this exception by the time Tomcat deploys
+and executes your application. If you get this exception, you should
 consider increasing the PermGen allocation for the Tomcat JVM. You can
-achieve this by adding "-XX:Ma<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">PermSize=256m" to the CATALINA_OPTS
+achieve this by adding "-XX:MaxPermSize=256m" to the CATALINA_OPTS
 environment variable before starting Tomcat.</p>
 
-<p><a name="Tomcat-OtherIssues">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Tomcat-OtherIssues"></a></p>
 
 <h2>Other Issues</h2>
 
@@ -285,11 +285,11 @@ the OpenEJB users <a href="openejb:maili
 <ul>
 <li>OpenEJB Version</li>
 <li>Tomcat Version</li>
-<li>Java Version (e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecute java -version)</li>
+<li>Java Version (execute java -version)</li>
 <li>Operating System Type and Version</li>
 </ul>
 
-<p><a name="Tomcat-Limitations">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Tomcat-Limitations"></a></p>
 
 <h1>Limitations</h1>
 
@@ -300,7 +300,7 @@ Once removed, the OpenEJB plugin for Tom
 the startup shell scripts and you will not need to restart Tomcat after the
 OpenEJB installation.</p>
 
-<p><a name="Tomcat-Misc">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Tomcat-Misc"></a></p>
 
 <h1>Misc</h1>
 
@@ -309,7 +309,7 @@ evolve based on user contributions. If y
 document, feel very welcome to click the 'Edit' link in the lower right and
 make changes and add new HOWTO's and other docs.  </p>
 
-<p><a name="Tomcat-JSFInjectionSupport">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="Tomcat-JSFInjectionSupport"></a></p>
 
 <h1>JSF Injection Support</h1>
 

Modified: websites/staging/openejb/trunk/content/transaction-annotations.html
==============================================================================
--- websites/staging/openejb/trunk/content/transaction-annotations.html (original)
+++ websites/staging/openejb/trunk/content/transaction-annotations.html Tue Jul 12 18:06:32 2011
@@ -152,19 +152,19 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="TransactionAnnotations-TransactionAnnotations">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+          <p><a name="TransactionAnnotations-TransactionAnnotations"></a></p>
 
 <h1>Transaction Annotations</h1>
 
-<p><em>also see [Testing Transactions](testing-transactions-e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample.html)
- for an e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample of how to use and test EJB transaction attributes</em></p>
+<p><em>also see <a href="testing-transactions-example.html">Testing Transactions</a>
+ for an example of how to use and test EJB transaction attributes</em></p>
 
-<p>The <em>java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.ejb.TransactionAttribute</em> annotation (@TransactionAttribute) can
+<p>The <em>javax.ejb.TransactionAttribute</em> annotation (@TransactionAttribute) can
 be applied to a bean class or it's methods.</p>
 
-<p>Usage of the @TransactionAttribute requires you to specify one of si<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">
+<p>Usage of the @TransactionAttribute requires you to specify one of six
 different transaction attribute types defined via the
-java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.ejb.TransactionAttributeType enum.</p>
+javax.ejb.TransactionAttributeType enum.</p>
 
 <ul>
 <li>TransactionAttributeType.<em>MANDATORY</em></li>
@@ -180,17 +180,17 @@ is <em>REQUIRED</em>.  The default trans
 applications is vendor specific.  In OpenEJB EJB 2.1, 2.0 and 1.1
 applications also use <em>REQUIRED</em> as the default.</p>
 
-<p><a name="TransactionAnnotations-AttributeTypessummary">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="TransactionAnnotations-AttributeTypessummary"></a></p>
 
 <h2>Attribute Types summary</h2>
 
 <p>A simplistic way to visualize the transaction attributes is as follows.</p>
 
-<p><table>
-<tr><td> &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">th><th> Failing &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">th><th> Correcting &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">th><th> No Change &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">th>&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tr>
-<tr><th> Transacted &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td><td> MANDATORY &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td><td> REQUIRED, REQUIRES_NEW &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td><td> SUPPORTS &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td>&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tr>
-<tr><th> Not Transacted &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td><td> NEVER &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td><td> NOT_SUPPORTED &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td><td> SUPPORTS &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td>&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tr>
-&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">table></p>
+<table>
+<tr><td> </th><th> Failing </th><th> Correcting </th><th> No Change </th></tr>
+<tr><th> Transacted </td><td> MANDATORY </td><td> REQUIRED, REQUIRES_NEW </td><td> SUPPORTS </td></tr>
+<tr><th> Not Transacted </td><td> NEVER </td><td> NOT_SUPPORTED </td><td> SUPPORTS </td></tr>
+</table>
 
 <p>The "<em>Transacted</em>" and "<em>Not Transacted</em>" categories represent the
 container guarantee, i.e. if the bean method will or will not be invoked in
@@ -198,75 +198,75 @@ a transaction.  The "<em>Failing</em>", 
 categories represent the action take by the container to achieve that
 guarantee.</p>
 
-<p>For e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample, <em>Never</em> and <em>Mandatory</em> are categorized as "<em>Failing</em>" and
-will cause the container to throw an e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception to the caller if there is
-(T<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Never) or is not (T<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Mandatory) a transaction in progress when the
+<p>For example, <em>Never</em> and <em>Mandatory</em> are categorized as "<em>Failing</em>" and
+will cause the container to throw an exception to the caller if there is
+(Tx Never) or is not (Tx Mandatory) a transaction in progress when the
 method is called.  The attributes <em>Required</em>, <em>RequiresNew</em>, and
 <em>NotSupported</em> are categorized as "<em>Correcting</em>" as they will cause the
 container to adjust the transactional state automatically as needed to
 match the desired state, rather than blocking the invocation by throwing an
-e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception.</p>
+exception.</p>
 
-<p><a name="TransactionAnnotations-DetaileddescriptionofeachAttribute">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="TransactionAnnotations-DetaileddescriptionofeachAttribute"></a></p>
 
 <h3>Detailed description of each Attribute</h3>
 
-<p><a name="TransactionAnnotations-MANDATORY">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="TransactionAnnotations-MANDATORY"></a></p>
 
 <h4>MANDATORY</h4>
 
-<p>A <em>MANDATORY</em> method is guaranteed to always be e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuted in a transaction. 
+<p>A <em>MANDATORY</em> method is guaranteed to always be executed in a transaction. 
 However, it's the caller's job to take care of suppling the transaction. 
 If the caller attempts to invoke the method <em>outside</em> of a transaction,
-then the container will block the call and throw them an <em>e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception</em>.</p>
+then the container will block the call and throw them an <em>exception</em>.</p>
 
-<p><a name="TransactionAnnotations-REQUIRED">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="TransactionAnnotations-REQUIRED"></a></p>
 
 <h4>REQUIRED</h4>
 
-<p>A <em>REQUIRED</em> method is guaranteed to always be e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuted in a transaction. 
+<p>A <em>REQUIRED</em> method is guaranteed to always be executed in a transaction. 
 If the caller attempts to invoke the method <em>outside</em> of a transaction, the
-container will <em>start</em> a transaction, e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecute the method, then <em>commit</em> the
+container will <em>start</em> a transaction, execute the method, then <em>commit</em> the
 transaction.</p>
 
-<p><a name="TransactionAnnotations-REQUIRES_NEW">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="TransactionAnnotations-REQUIRES_NEW"></a></p>
 
 <h4>REQUIRES_NEW</h4>
 
-<p>A <em>REQUIRES</em>NEW_ method is guaranteed to always be e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuted in a
+<p>A <em>REQUIRES</em>NEW_ method is guaranteed to always be executed in a
 transaction.  If the caller attempts to invoke the method <em>inside or
 outside</em> of a transaction, the container will still <em>start</em> a transaction,
-e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecute the method, then <em>commit</em> the transaction.  Any transaction the
-caller may have in progress will be <em>suspended</em> before the method e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecution
+execute the method, then <em>commit</em> the transaction.  Any transaction the
+caller may have in progress will be <em>suspended</em> before the method execution
 then <em>resumed</em> afterward.</p>
 
-<p><a name="TransactionAnnotations-NEVER">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="TransactionAnnotations-NEVER"></a></p>
 
 <h4>NEVER</h4>
 
-<p>A <em>NEVER</em> method is guaranteed to never be e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuted in a transaction. 
+<p>A <em>NEVER</em> method is guaranteed to never be executed in a transaction. 
 However, it's the caller's job to ensure there is no transaction.  If the
 caller attempts to invoke the method <em>inside</em> of a transaction, then the
-container will block the call and throw them an <em>e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception</em>.</p>
+container will block the call and throw them an <em>exception</em>.</p>
 
-<p><a name="TransactionAnnotations-NOT_SUPPORTED">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="TransactionAnnotations-NOT_SUPPORTED"></a></p>
 
 <h4>NOT_SUPPORTED</h4>
 
-<p>A <em>NOT</em>SUPPORTED_ method is guaranteed to never be e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuted in a
+<p>A <em>NOT</em>SUPPORTED_ method is guaranteed to never be executed in a
 transaction.  If the caller attempts to invoke the method <em>inside</em> of a
-transaction, the container will <em>suspend</em> the caller's transaction, e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecute
+transaction, the container will <em>suspend</em> the caller's transaction, execute
 the method, then <em>resume</em> the caller's transaction.</p>
 
-<p><a name="TransactionAnnotations-SUPPORTS">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="TransactionAnnotations-SUPPORTS"></a></p>
 
 <h4>SUPPORTS</h4>
 
-<p>A <em>SUPPORTS</em> method is guaranteed to adopt the e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">act transactional state of
+<p>A <em>SUPPORTS</em> method is guaranteed to adopt the exact transactional state of
 the caller.  These methods can be invoked by caller's <em>inside or outside</em>
 of a transaction.  The container will do nothing to change that state.</p>
 
-<p><a name="TransactionAnnotations-OnMethods">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="TransactionAnnotations-OnMethods"></a></p>
 
 <h2>On Methods</h2>
 
@@ -289,7 +289,7 @@ public static class MyBean implements My
 <li><em>codeBlue</em> will be invoked with the default attribute of <em>REQUIRED</em></li>
 </ul>
 
-<p><a name="TransactionAnnotations-OnClasses">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="TransactionAnnotations-OnClasses"></a></p>
 
 <h2>On Classes</h2>
 
@@ -312,9 +312,9 @@ public static class MyBean implements My
 <em>MANDATORY</em></li>
 </ul>
 
-<p><a name="TransactionAnnotations-Mi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">edonclassesandmethods">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="TransactionAnnotations-Mixedonclassesandmethods"></a></p>
 
-<h2>Mi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ed on classes and methods</h2>
+<h2>Mixed on classes and methods</h2>
 
 <pre><code>@Stateless
 @TransactionAttribute(TransactionAttributeType.SUPPORTS)
@@ -342,7 +342,7 @@ public static class MyBean implements My
 <li><em>codeGreen</em> will be invoked with the attribute of <em>REQUIRED</em></li>
 </ul>
 
-<p><a name="TransactionAnnotations-IllegalUsage">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="TransactionAnnotations-IllegalUsage"></a></p>
 
 <h1>Illegal Usage</h1>
 
@@ -368,11 +368,11 @@ public class MyStatefulBean implements  
 
     @AroundInvoke
     @TransactionAttribute(TransactionAttributeType.NEVER)
-    public Object invoke(InvocationConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t invocationConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t) throws
+    public Object invoke(InvocationContext invocationContext) throws
 </code></pre>
 
-<p>E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception {
-        return invocationConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t.proceed();
+<p>Exception {
+        return invocationContext.proceed();
         }</p>
 
 <pre><code>    @PostActivate

Modified: websites/staging/openejb/trunk/content/understanding-callbacks.html
==============================================================================
--- websites/staging/openejb/trunk/content/understanding-callbacks.html (original)
+++ websites/staging/openejb/trunk/content/understanding-callbacks.html Tue Jul 12 18:06:32 2011
@@ -152,11 +152,11 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p>The rules here are pretty hard to follow without e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples.  </p>
+          <p>The rules here are pretty hard to follow without examples.  </p>
 
 <p>When they say one AroundInvoke per class they mean that in the most literal
 sense as in one individual java class definition, not including it's parent
-class or classes, may e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">actly one AroundInvoke method.   The bean or
+class or classes, may exactly one AroundInvoke method.  The bean or
 interceptor class may have an AroundInvoke method, its parent class may
 have an AroundInvoke method, the parent's parent class may have an
 AroundInvoke method and so on.</p>
@@ -165,23 +165,23 @@ AroundInvoke method and so on.</p>
 
 <pre><code>public class Plant {
     @AroundInvoke
-    public Object a(InvocationConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t ct&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;) throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
-        return ct&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.proceed();
+    public Object a(InvocationContext ctx) throws Exception {
+        return ctx.proceed();
     }
 }
 
-public class Fruit e&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;tends Plant {
+public class Fruit extends Plant {
     @AroundInvoke
-    public Object b(InvocationConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t ct&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;) throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
-        return ct&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.proceed();
+    public Object b(InvocationContext ctx) throws Exception {
+        return ctx.proceed();
     }
 }
 
 @Stateless
-public class Apple e&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;tends Fruit implements AppleLocal {
+public class Apple extends Fruit implements AppleLocal {
     @AroundInvoke
-    public Object c(InvocationConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t ct&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;) throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
-        return ct&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.proceed();
+    public Object c(InvocationContext ctx) throws Exception {
+        return ctx.proceed();
     }
 
     public String grow(){
@@ -204,16 +204,16 @@ parent class by simply overriding the me
 around invoke with a slightly different version of Apple as follows:</p>
 
 <pre><code>@Stateless
-public class Apple e&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;tends Fruit implements AppleLocal {
+public class Apple extends Fruit implements AppleLocal {
 
-    &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt; This will now never be called.
-    public Object a(InvocationConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t ct&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;) throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
+    // This will now never be called.
+    public Object a(InvocationContext ctx) throws Exception {
         return null;
     }
 
     @AroundInvoke
-    public Object c(InvocationConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t ct&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;) throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
-        return ct&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.proceed();
+    public Object c(InvocationContext ctx) throws Exception {
+        return ctx.proceed();
     }
 
     public String grow(){
@@ -227,14 +227,14 @@ the container will first invoke the Arou
 skipping "a" completely.</p>
 
 <p>When they say that an AroundInvoke method cannot be a business method, they
-mean that they cannot be e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">posed to clients through a local or remote
+mean that they cannot be exposed to clients through a local or remote
 interface.  The following would be illegal.</p>
 
 <pre><code>public interface AppleLocal {
     public String grow();
 
-    &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt; This is an AroundInvoke method in the bean class, not a legal business method!
-    public Object c(InvocationConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t ct&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;) throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception;
+    // This is an AroundInvoke method in the bean class, not a legal business method!
+    public Object c(InvocationContext ctx) throws Exception;
 }
 </code></pre>
 

Modified: websites/staging/openejb/trunk/content/understanding-the-directory-layout.html
==============================================================================
--- websites/staging/openejb/trunk/content/understanding-the-directory-layout.html (original)
+++ websites/staging/openejb/trunk/content/understanding-the-directory-layout.html Tue Jul 12 18:06:32 2011
@@ -154,64 +154,64 @@
             <DIV id="PageContent">
           <p>When freshly unpacked, OpenEJB will look like this:</p>
 
-<pre><code>openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;
-openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;logs&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;
-openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;apps&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;
-openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;lib&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;
-openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;lib&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;_&lt;several jars&gt;_
-openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;LICENSE.t&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t
-openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;NOTICE.t&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t
-openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;README.t&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t
-openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;bin&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;
-openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;bin&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb.bat
-openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;bin&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb
-openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;conf&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;
-openejb-3.0&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;conf&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;README.t&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t
+<pre><code>openejb-3.0/
+openejb-3.0/logs/
+openejb-3.0/apps/
+openejb-3.0/lib/
+openejb-3.0/lib/_&lt;several jars&gt;_
+openejb-3.0/LICENSE.txt
+openejb-3.0/NOTICE.txt
+openejb-3.0/README.txt
+openejb-3.0/bin/
+openejb-3.0/bin/openejb.bat
+openejb-3.0/bin/openejb
+openejb-3.0/conf/
+openejb-3.0/conf/README.txt
 </code></pre>
 
-<p><a name="UnderstandingtheDirectoryLayout-Directories">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnderstandingtheDirectoryLayout-Directories"></a></p>
 
 <h1>Directories</h1>
 
-<p><a name="UnderstandingtheDirectoryLayout-bin<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnderstandingtheDirectoryLayout-bin/"></a></p>
 
-<h2>bin<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"></h2>
+<h2>bin/</h2>
 
-<p>Contains commands to start<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">stop the server (You can also do a lot of other
-stuff like deploy<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">undeploy, but we will just talk about things needed to
+<p>Contains commands to start/stop the server (You can also do a lot of other
+stuff like deploy/undeploy, but we will just talk about things needed to
 get you started)</p>
 
-<p><a name="UnderstandingtheDirectoryLayout-lib<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnderstandingtheDirectoryLayout-lib/"></a></p>
 
-<h2>lib<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"></h2>
+<h2>lib/</h2>
 
 <p>Contains several jar files (you only need of few of these jars in your
 classpath to do EJB development)</p>
 
-<p><a name="UnderstandingtheDirectoryLayout-apps<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnderstandingtheDirectoryLayout-apps/"></a></p>
 
-<h2>apps<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"></h2>
+<h2>apps/</h2>
 
 <p>Once you create your EJB's and jar them up, you can place your jar file in
 this directory and start the server. The server will automatically deploy
 all the EJB's contained in this JAR.</p>
 
-<p><a name="UnderstandingtheDirectoryLayout-logs<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnderstandingtheDirectoryLayout-logs/"></a></p>
 
-<h2>logs<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"></h2>
+<h2>logs/</h2>
 
 <p>Contains log files.</p>
 
-<p><a name="UnderstandingtheDirectoryLayout-conf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnderstandingtheDirectoryLayout-conf/"></a></p>
 
-<h2>conf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"></h2>
+<h2>conf/</h2>
 
-<p>This directory contains nothing but a README.t<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t file at the time OpenEJB
+<p>This directory contains nothing but a README.txt file at the time OpenEJB
 is unpacked.  The first time OpenEJB is started however, these files will
 be created:</p>
 
-<pre><code>  conf&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;
-    openejb.&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ml         (main config file)
+<pre><code>  conf/
+    openejb.xml            (main config file)
 
     logging.properties         (log levels and files)
 

Modified: websites/staging/openejb/trunk/content/unit-testing-transactions.html
==============================================================================
--- websites/staging/openejb/trunk/content/unit-testing-transactions.html (original)
+++ websites/staging/openejb/trunk/content/unit-testing-transactions.html Tue Jul 12 18:06:32 2011
@@ -152,23 +152,23 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="UnitTestingTransactions-Basicsetup">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+          <p><a name="UnitTestingTransactions-Basicsetup"></a></p>
 
 <h1>Basic setup</h1>
 
 <p>Add the following interface and bean to your test sources (they could even
 be inner classes of a test case):</p>
 
-<p><a name="UnitTestingTransactions-Businessinterface">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnitTestingTransactions-Businessinterface"></a></p>
 
 <h2>Business interface</h2>
 
 <pre><code>public interface Caller {
-    public &lt;V&gt; V call(Callable&lt;V&gt; callable) throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception;
+    public &lt;V&gt; V call(Callable&lt;V&gt; callable) throws Exception;
 }
 </code></pre>
 
-<p><a name="UnitTestingTransactions-BeanImplementation(s)">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnitTestingTransactions-BeanImplementation(s)"></a></p>
 
 <h2>Bean Implementation(s)</h2>
 
@@ -177,31 +177,31 @@ be inner classes of a test case):</p>
 @Stateless
 @TransactionAttribute(REQUIRES_NEW)
 public class TransactionBean implements Caller {
-    public &lt;V&gt; V call(Callable&lt;V&gt; callable) throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
+    public &lt;V&gt; V call(Callable&lt;V&gt; callable) throws Exception {
     return callable.call();
     }
 }
 </code></pre>
 
-<p><a name="UnitTestingTransactions-Havethemdiscovered">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnitTestingTransactions-Havethemdiscovered"></a></p>
 
 <h2>Have them discovered</h2>
 
-<p>In src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">test<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">resources<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> (or related) create an META-INF<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">ejb-jar.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml
-containing the te<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t "<ejb-jar<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">>"</p>
+<p>In src/test/resources/ (or related) create an META-INF/ejb-jar.xml
+containing the text "<ejb-jar/>"</p>
 
-<p><a name="UnitTestingTransactions-Whatweaccomplished">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnitTestingTransactions-Whatweaccomplished"></a></p>
 
 <h2>What we accomplished</h2>
 
 <p>Essentially what we've done is added an ejb that will be picked up as part
 of your test code and deployed.  You can then look it up and use it to
-e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecute test code with any particular transaction or security constraints
+execute test code with any particular transaction or security constraints
 that you want.  The above bean specifies REQUIRES_NEW; functionally the
 same as REQUIRED as the test case itself won't have a transaction, but a
-little cleaner and more e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">plicit.  </p>
+little cleaner and more explicit.  </p>
 
-<p>You could also annotate the bean with @RunAs("manager") for e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample and
+<p>You could also annotate the bean with @RunAs("manager") for example and
 test that your security restrictions are how you like them.  You can have
 as many of these test beans in your test code as you like, each with it's
 own transaction and security constraints allowing you to write some
@@ -209,10 +209,10 @@ incredibly thorough tests.</p>
 
 <p>You do not need to use java.util.concurrent.Callable, any similar interface
 of your creation could work just as well.  You may want something with
-return type void, for e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample, to eliminate useless 'return null'
+return type void, for example, to eliminate useless 'return null'
 statements.</p>
 
-<p><a name="UnitTestingTransactions-Usage">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnitTestingTransactions-Usage"></a></p>
 
 <h1>Usage</h1>
 
@@ -220,37 +220,37 @@ statements.</p>
 around the creation of the Callable object you pass in, and it all really
 depends on what looks nice to you.</p>
 
-<p>In the e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples below, the Movies bean being tested is simply a thin layer
+<p>In the examples below, the Movies bean being tested is simply a thin layer
 around JPA that allows us to use enforce various transaction semantics.</p>
 
-<pre><code>import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.ejb.Stateful;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.ejb.TransactionAttribute;
-import static java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.ejb.TransactionAttributeType.MANDATORY;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.persistence.EntityManager;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.persistence.PersistenceConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.persistence.PersistenceConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;tType;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.persistence.Query;
+<pre><code>import javax.ejb.Stateful;
+import javax.ejb.TransactionAttribute;
+import static javax.ejb.TransactionAttributeType.MANDATORY;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.Query;
 import java.util.List;
 
 @Stateful(name = "Movies")
 @TransactionAttribute(MANDATORY)
 public class MoviesImpl implements Movies {
 
-    @PersistenceConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t(unitName = "movie-unit", type =
+    @PersistenceContext(unitName = "movie-unit", type =
 </code></pre>
 
-<p>PersistenceConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">tType.TRANSACTION)
+<p>PersistenceContextType.TRANSACTION)
         private EntityManager entityManager;</p>
 
-<pre><code>    public void addMovie(Movie movie) throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
+<pre><code>    public void addMovie(Movie movie) throws Exception {
     entityManager.persist(movie);
     }
 
-    public void deleteMovie(Movie movie) throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
+    public void deleteMovie(Movie movie) throws Exception {
     entityManager.remove(movie);
     }
 
-    public List&lt;Movie&gt; getMovies() throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
+    public List&lt;Movie&gt; getMovies() throws Exception {
     Query query = entityManager.createQuery("SELECT m from Movie as
 </code></pre>
 
@@ -261,28 +261,28 @@ public class MoviesImpl implements Movie
 
 <p>Test code below.</p>
 
-<p><a name="UnitTestingTransactions-Pureinlined">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnitTestingTransactions-Pureinlined"></a></p>
 
 <h2>Pure inlined</h2>
 
 <p>The Callable can be created right in the test method itself.</p>
 
-<pre><code>public class MoviesTest e&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;tends TestCase {
-    private Conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t;
+<pre><code>public class MoviesTest extends TestCase {
+    private Context context;
 
-    protected void setUp() throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
-    &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt; initialize jndi conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t as usual
+    protected void setUp() throws Exception {
+    // initialize jndi context as usual
     }
 
-    public void test() throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
+    public void test() throws Exception {
     Caller transactionBean = (Caller)
 </code></pre>
 
-<p>conte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t.lookup("TransactionBeanLocal");</p>
+<p>context.lookup("TransactionBeanLocal");</p>
 
 <pre><code>    transactionBean.call(new Callable() {
-        public Object call() throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
-        Movies movies = (Movies) conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t.lookup("MoviesLocal");
+        public Object call() throws Exception {
+        Movies movies = (Movies) context.lookup("MoviesLocal");
 
         movies.addMovie(new Movie("Quentin Tarantino", "Reservoir
 </code></pre>
@@ -311,7 +311,7 @@ public class MoviesImpl implements Movie
 }
 </code></pre>
 
-<p><a name="UnitTestingTransactions-Sametestcode,differenttransactionscenarios">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<p><a name="UnitTestingTransactions-Sametestcode,differenttransactionscenarios"></a></p>
 
 <h2>Same test code, different transaction scenarios</h2>
 
@@ -319,15 +319,15 @@ public class MoviesImpl implements Movie
 to guarantee everyone is doing the right thing in all situations.  Negative
 testing is often a very good way to stomp out dangerous bugs.</p>
 
-<pre><code>public class MoviesTest e&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;tends TestCase {
-    private Conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t;
+<pre><code>public class MoviesTest extends TestCase {
+    private Context context;
 
-    protected void setUp() throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
-    &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt; initialize jndi conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t as usual
+    protected void setUp() throws Exception {
+    // initialize jndi context as usual
     }
 
-    private void doWork() throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
-    Movies movies = (Movies) conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t.lookup("MoviesLocal");
+    private void doWork() throws Exception {
+    Movies movies = (Movies) context.lookup("MoviesLocal");
 
     movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs",
 </code></pre>
@@ -346,29 +346,29 @@ testing is often a very good way to stom
     assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
     }
 
-    public void testWithTransaction() throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
+    public void testWithTransaction() throws Exception {
     Caller transactionBean = (Caller)
 </code></pre>
 
-<p>conte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t.lookup("TransactionBeanLocal");</p>
+<p>context.lookup("TransactionBeanLocal");</p>
 
 <pre><code>    transactionBean.call(new Callable(){
-        public Object call() throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
+        public Object call() throws Exception {
         doWork();
         return null;
         }
     });
     }
 
-    public void testWithoutTransaction() throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
+    public void testWithoutTransaction() throws Exception {
     try {
         doWork();
         fail("The Movies bean should be using
 </code></pre>
 
 <p>TransactionAttributeType.MANDATORY");
-        } catch (java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.transaction.TransactionRequiredE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception e) {
-            <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> good, our Movies bean is using
+        } catch (javax.transaction.TransactionRequiredException e) {
+            // good, our Movies bean is using
 TransactionAttributeType.MANDATORY as we want
         }
         }