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 [14/49] - /websites/staging/openejb/trunk/content/

Modified: websites/staging/openejb/trunk/content/embedded-configuration.html
==============================================================================
--- websites/staging/openejb/trunk/content/embedded-configuration.html (original)
+++ websites/staging/openejb/trunk/content/embedded-configuration.html Tue Jul 12 18:06:32 2011
@@ -152,12 +152,12 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="EmbeddedConfiguration-Defaults,OverridesandOrder">&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="EmbeddedConfiguration-Defaults,OverridesandOrder"></a></p>
 
 <h1>Defaults, Overrides and Order</h1>
 
-<p>When booting up OpenEJB for testing via the LocalInitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">tFactory
-there is quite a bit of fle<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ibility to how things are configured.</p>
+<p>When booting up OpenEJB for testing via the LocalInitialContextFactory
+there is quite a bit of flexibility to how things are configured.</p>
 
 <p>OpenEJB will function fine with no configuration at all and will happily
 create things as needed and select defaults for everything.  So in a real
@@ -166,91 +166,91 @@ several places to put your overrides and
 applied.  Here they are in order of preference; 1 = highest, 5 = lowest.</p>
 
 <ol>
-<li>InitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t properties</li>
+<li>InitialContext properties</li>
 <li>jndi.properties from the classpath</li>
 <li>System properties</li>
-<li>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 declarations<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">properties</li>
-<li>service-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 declarations<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">properties (internal concept, no need to
+<li>openejb.xml declarations/properties</li>
+<li>service-jar.xml declarations/properties (internal concept, no need to
 worry about it)</li>
 </ol>
 
 <p>It opens up some interesting possibilities in how you configure your
 environment.  You could do 100% of your configuration in your test case via
-InitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t propertes, or you could do say 80% in a jndi.properties file
-or 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 and 20% in your test case via InitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t
+InitialContext propertes, or you could do say 80% in a jndi.properties file
+or openejb.xml file and 20% in your test case via InitialContext
 properties.  You can put 100% of your configuration in a jndi.properties or
-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 and override them via InitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t properties.</p>
+openejb.xml file and override them via InitialContext properties.</p>
 
 <p>You can manage the properties how you wish and there is no need for
 redundant definitions if you do not want them.</p>
 
-<p><a name="EmbeddedConfiguration-Whatisconfigurable?">&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="EmbeddedConfiguration-Whatisconfigurable?"></a></p>
 
 <h1>What is configurable?</h1>
 
-<p>Everything you can configure via an 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 (minus the <Deployment>
-element) can be configured<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">overridden via properties. See <a href="configuring-containers-in-tests.html">Configuring Containers in Tests</a>
+<p>Everything you can configure via an openejb.xml (minus the <Deployment>
+element) can be configured/overridden via properties. See <a href="configuring-containers-in-tests.html">Configuring Containers in Tests</a>
  and [Configuring DataSources in Tests]
 .</p>
 
-<p>Everything in your logging.properties can be configured<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">overridden via
+<p>Everything in your logging.properties can be configured/overridden via
 properties.  See <a href="configuring-logging-in-tests.html">Configuring Logging in Tests</a>
 .</p>
 
-<p>The properties of persistence units declared in a persistence.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml can be
-configured<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">overridden via properties.  See <a href="configuring-persistenceunits-in-tests.html">Configuring PersistenceUnits in Tests</a>
+<p>The properties of persistence units declared in a persistence.xml can be
+configured/overridden via properties.  See <a href="configuring-persistenceunits-in-tests.html">Configuring PersistenceUnits in Tests</a>
 .</p>
 
 <p>OpenEJB has many flags that can also be set as properties.  See <a href="openejb-properties.html">OpenEJB Properties</a>
  for details on those.</p>
 
-<p><a name="EmbeddedConfiguration-E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ampleofusingInitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">tproperties">&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="EmbeddedConfiguration-ExampleofusingInitialContextproperties"></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">ample of using InitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t properties</h1>
+<h1>Example of using InitialContext properties</h1>
 
 <pre><code>Properties p = new Properties();
 
-&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; set the initial 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 factory
+// set the initial context factory
 p.put("java.naming.factory.initial ", "
 </code></pre>
 
-<p>org.apache.openejb.client.LocalInitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">tFactory");</p>
+<p>org.apache.openejb.client.LocalInitialContextFactory");</p>
 
-<pre><code>&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; change some logging
+<pre><code>// change some logging
 p.put("log4j.category.OpenEJB.options ", " debug");
 p.put("log4j.category.OpenEJB.startup ", " debug");
 p.put("log4j.category.OpenEJB.startup.config ", " debug");
 
-&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; create some resources
-p.put("movieDatabase = 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"&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;Resource?type", "DataSource");
+// create some resources
+p.put("movieDatabase = new://Resource?type", "DataSource");
 p.put("movieDatabase.JdbcDriver ", " org.hsqldb.jdbcDriver");
 p.put("movieDatabase.JdbcUrl ", " jdbc:hsqldb:mem:moviedb");
 
-&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; override properties on your "movie-unit" persistence unit
+// override properties on your "movie-unit" persistence unit
 p.put("movie-unit.hibernate.dialect ", "
 </code></pre>
 
 <p>org.hibernate.dialect.HSQLDialect");</p>
 
-<pre><code>&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; set some openejb flags
-p.put("openejb.jndiname.format ", " {ejbName}&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;{interfaceClass}");
+<pre><code>// set some openejb flags
+p.put("openejb.jndiname.format ", " {ejbName}/{interfaceClass}");
 p.put("openejb.descriptors.output ", " true");
 p.put("openejb.validation.output.level ", " verbose");
 
-InitialConte&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 initialConte&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 = new InitialConte&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(p);
+InitialContext initialContext = new InitialContext(p);
 </code></pre>
 
-<p><a name="EmbeddedConfiguration-E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ampleofusingjndi.properties">&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="EmbeddedConfiguration-Exampleofusingjndi.properties"></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">ample of using jndi.properties</h1>
+<h1>Example of using jndi.properties</h1>
 
-<p>Here's 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 the same properties being specified via a
+<p>Here's an example of the same properties being specified via a
 <code>jndi.properties file</code>.  This file just needs to be placed in the classpath,
 not in a subdirectory of a path in the classpath such as META-INF, but at
 the root of any of the paths in the classpath.</p>
 
-<pre><code># set the initial 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 factory
-java.naming.factory.initial = org.apache.openejb.client.LocalInitialConte&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;tFactory
+<pre><code># set the initial context factory
+java.naming.factory.initial = org.apache.openejb.client.LocalInitialContextFactory
 
 # change some logging
 log4j.category.OpenEJB.options = debug
@@ -258,7 +258,7 @@ log4j.category.OpenEJB.startup = debug
 log4j.category.OpenEJB.startup.config = debug
 
 # create some resources
-movieDatabase = 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"&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;Resource?type=DataSource
+movieDatabase = new://Resource?type=DataSource
 movieDatabase.JdbcDriver = org.hsqldb.jdbcDriver
 movieDatabase.JdbcUrl = jdbc:hsqldb:mem:moviedb
 
@@ -266,19 +266,19 @@ movieDatabase.JdbcUrl = jdbc:hsqldb:mem:
 movie-unit.hibernate.dialect = org.hibernate.dialect.HSQLDialect
 
 # set some openejb flags
-openejb.jndiname.format = {ejbName}&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;{interfaceClass}
+openejb.jndiname.format = {ejbName}/{interfaceClass}
 openejb.descriptors.output = true
 openejb.validation.output.level = verbose
 </code></pre>
 
-<p>Then OpenEJB can be booted via the InitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t as normal.  Properties
+<p>Then OpenEJB can be booted via the InitialContext as normal.  Properties
 can still be used to override any of the above properties:</p>
 
 <pre><code>Properties p = new Properties();
 
 p.put("openejb.validation.output.level ", " medium");
 
-InitialConte&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 initialConte&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 = new InitialConte&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(p);
+InitialContext initialContext = new InitialContext(p);
 </code></pre>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/embedding.html
==============================================================================
--- websites/staging/openejb/trunk/content/embedding.html (original)
+++ websites/staging/openejb/trunk/content/embedding.html Tue Jul 12 18:06:32 2011
@@ -157,10 +157,10 @@
 <ol>
 <li>Add the OpenEJB libraries to your classpath</li>
 <li>Ensure your EJB modules are discoverable</li>
-<li>Use the LocalInitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">tFactory to boot OpenEJB</li>
+<li>Use the LocalInitialContextFactory to boot OpenEJB</li>
 </ol>
 
-<p><a name="Embedding-Importantdocs">&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="Embedding-Importantdocs"></a></p>
 
 <h2>Important docs</h2>
 
@@ -177,11 +177,11 @@
 <li><a href="local-client-injection.html">TestCase Injection (@LocalClient)</a></li>
 </ul>
 
-<p><a name="Embedding-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">&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="Embedding-Examples"></a></p>
 
-<h2>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</h2>
+<h2>Examples</h2>
 
-<p>{include: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 Table}</p>
+<p>{include:Examples Table}</p>
 
             </DIV>
           </P>

Modified: websites/staging/openejb/trunk/content/examples-table.html
==============================================================================
--- websites/staging/openejb/trunk/content/examples-table.html (original)
+++ websites/staging/openejb/trunk/content/examples-table.html Tue Jul 12 18:06:32 2011
@@ -152,174 +152,175 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p>{span:class=E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amplesTable}
+          <p>{span:class=ExamplesTable}</p>
+
 <table>
-<tr><th> title &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> description &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> APIs used &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><td> {div:class=Cel1}<em>[Simple Stateless](simple-stateless-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)
-*{div} &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> Simple EJB3 *@Stateless</em> bean with local and remote business
-interfaces and unit test. &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>  - 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.Remote
-&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>
- - 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.Local
- - 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.Stateless
-<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">tr>
-<tr><td> <em>[Simple Stateful](simple-stateful-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)
-* &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> Simple EJB3 *@Stateful</em> bean with local and remote business interfaces
-and unit test. &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>  - 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.Remote
-&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>
- - 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.Stateful
-<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">tr>
-<tr><td> <em>[EJB 3.1 Singleton](singleton-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)
-* &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> Shows two EJB 3.1 *@Singleton</em> beans.  One configured to load on
-startup via <em>@Startup</em> and using Bean-Managed Concurrency and
+<tr><th> title </th><th> description </th><th> APIs used </th></tr>
+<tr><td> {div:class=Cel1}*[Simple Stateless](simple-stateless-example.html)
+*{div} </td><td> Simple EJB3 *@Stateless* bean with local and remote business
+interfaces and unit test. </td><td>  - javax.ejb.Remote
+</tr>
+ - javax.ejb.Local
+ - javax.ejb.Stateless
+<tr></tr>
+<tr><td> *[Simple Stateful](simple-stateful-example.html)
+* </td><td> Simple EJB3 *@Stateful* bean with local and remote business interfaces
+and unit test. </td><td>  - javax.ejb.Remote
+</tr>
+ - javax.ejb.Stateful
+<tr></tr>
+<tr><td> *[EJB 3.1 Singleton](singleton-example.html)
+* </td><td> Shows two EJB 3.1 *@Singleton* beans.  One configured to load on
+startup via *@Startup* and using Bean-Managed Concurrency and
 synchronization.  Another using Container-Managed Concurrency via
-<em>@Lock(READ)</em> and <em>@Lock(WRITE)</em>.  &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>   - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.annotation.PostConstruct
-&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>
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.annotation.PreDestroy
- - 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.ConcurrencyManagement
- - 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.Lock
- - 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.Singleton
- - 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.Startup
- - 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.ConcurrencyManagementType.BEAN
- - 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.LockType.READ
- - 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.LockType.WRITE
-<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">tr>
-<tr><td> <em>[EJB 2.1 Compatibility](ejb-2.1-compatibility-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)
-* &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> Shows an EJB 3.0 Stateful bean with Business interfaces and EJB 2.1
-interfaces (now called "component" interfaces) using the *@LocalHome</em> and
-<em>@RemoteHome</em>. Four interfaces in total. &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>  - 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.CreateE<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">tr>
- - 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.EJBHome
- - 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.EJBLocalHome
- - 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.EJBLocalObject
- - 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.EJBObject
- - 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.Init
- - 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.Local
- - 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.LocalHome
- - 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.Remote
- - 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.RemoteHome
- - 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.Remove
- - 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.Stateful
-<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">tr>
-<tr><td> <em>[Injection of env-entry](injection-of-env-entry-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)
-* &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> Shows how *@Resource</em> can be used to inject <strong>env-entry</strong> values
-declared in an 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 file &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>  - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.annotation.Resource
-&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>
- - 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.Local
- - 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.Remote
- - 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.Stateful
-<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">tr>
-<tr><td> <em><a href="custom-injection.html">Injection of env-entry 2</a>
-* &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> Same as the above 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 but shows how to use a *properties file</em> to
-declare the injection values and demonstrates how to get injection of <em>more
-types</em> such as java.util.Date, java.lang.Class, java.net.URI and more. 
-<em>OpenEJB specific feature</em>. &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>  - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.annotation.Resource
-&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>
- - 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.Stateless
-<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">tr>
-<tr><td> <em>[Injection of other EJBs](injection-of-other-ejbs-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)
-* &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> Shows use of *@EJB</em> in a Stateless to have another Stateless bean
-injected into it. &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>  - 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.EJB
-&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>
- - 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.Local
- - 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.Remote
- - 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.Stateless
-<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">tr>
-<tr><td> <em>[Injection of DataSource](injection-of-datasource-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)
-* &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> Shows use of *@Resource</em> to have a JDBC <em>DataSource</em> injected into a
+*@Lock(READ)* and *@Lock(WRITE)*.  </td><td>   - javax.annotation.PostConstruct
+</tr>
+ - javax.annotation.PreDestroy
+ - javax.ejb.ConcurrencyManagement
+ - javax.ejb.Lock
+ - javax.ejb.Singleton
+ - javax.ejb.Startup
+ - javax.ejb.ConcurrencyManagementType.BEAN
+ - javax.ejb.LockType.READ
+ - javax.ejb.LockType.WRITE
+<tr></tr>
+<tr><td> *[EJB 2.1 Compatibility](ejb-2.1-compatibility-example.html)
+* </td><td> Shows an EJB 3.0 Stateful bean with Business interfaces and EJB 2.1
+interfaces (now called "component" interfaces) using the *@LocalHome* and
+*@RemoteHome*. Four interfaces in total. </td><td>  - javax.ejb.CreateException
+</tr>
+ - javax.ejb.EJBHome
+ - javax.ejb.EJBLocalHome
+ - javax.ejb.EJBLocalObject
+ - javax.ejb.EJBObject
+ - javax.ejb.Init
+ - javax.ejb.Local
+ - javax.ejb.LocalHome
+ - javax.ejb.Remote
+ - javax.ejb.RemoteHome
+ - javax.ejb.Remove
+ - javax.ejb.Stateful
+<tr></tr>
+<tr><td> *[Injection of env-entry](injection-of-env-entry-example.html)
+* </td><td> Shows how *@Resource* can be used to inject **env-entry** values
+declared in an ejb-jar.xml file </td><td>  - javax.annotation.Resource
+</tr>
+ - javax.ejb.Local
+ - javax.ejb.Remote
+ - javax.ejb.Stateful
+<tr></tr>
+<tr><td> *[Injection of env-entry 2](custom-injection.html)
+* </td><td> Same as the above example but shows how to use a *properties file* to
+declare the injection values and demonstrates how to get injection of *more
+types* such as java.util.Date, java.lang.Class, java.net.URI and more. 
+_OpenEJB specific feature_. </td><td>  - javax.annotation.Resource
+</tr>
+ - javax.ejb.Stateless
+<tr></tr>
+<tr><td> *[Injection of other EJBs](injection-of-other-ejbs-example.html)
+* </td><td> Shows use of *@EJB* in a Stateless to have another Stateless bean
+injected into it. </td><td>  - javax.ejb.EJB
+</tr>
+ - javax.ejb.Local
+ - javax.ejb.Remote
+ - javax.ejb.Stateless
+<tr></tr>
+<tr><td> *[Injection of DataSource](injection-of-datasource-example.html)
+* </td><td> Shows use of *@Resource* to have a JDBC *DataSource* injected into a
 Stateful bean.  The Stateful bean does basic INSERT, SELECT and DELETE SQL
-operations. &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>  - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.annotation.PostConstruct
-&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>
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.annotation.Resource
- - 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.Stateful
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.sql.DataSource
-<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">tr>
-<tr><td> <em>[Injection of EntityManager](injection-of-entitymanager-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)
-* &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> Shows use of *@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> to have an <em>EntityManager</em> with an
-<em>EXTENDED</em> persistence 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 injected into a @Stateful bean.   An EJB 3
-<em>@Entity</em> bean is used with the EntityManager to create, persist and merge
-data to a database. &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>  - 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.Stateful
-&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>
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.Entity
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.EntityManager
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.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
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.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.EXTENDED
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.Query
-<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">tr>
-<tr><td> <em>[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)
-* &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> Shows use of @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 to have an *EntityManager</em> with an
-<em>TRANSACTION</em> persistence 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 injected into a <em>@Stateful</em> bean using
-the <em>@TransactionAttribute</em> annotation and a TestCase that runs test code
-in a JTA <em>Transaction</em>.  An EJB 3 @Entity bean is used with the
-EntityManager to create, persist and merge data to a database. &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>   -
-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.Stateful
-&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>
- - 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.Stateless
- - 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
- - 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.MANDATORY
- - 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.REQUIRES_NEW
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.Entity
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.EntityManager
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.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
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.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
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.Query
-<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">tr>
-<tr><td> <em>[Testing Security](testing-security-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)
-* &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> Builds upon the [Injection of EntityManager 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]
- but adds the use of *@RolesAllowed</em> and <em>@PermitAll</em> in the @Stateful bean
+operations. </td><td>  - javax.annotation.PostConstruct
+</tr>
+ - javax.annotation.Resource
+ - javax.ejb.Stateful
+ - javax.sql.DataSource
+<tr></tr>
+<tr><td> *[Injection of EntityManager](injection-of-entitymanager-example.html)
+* </td><td> Shows use of *@PersistenceContext* to have an *EntityManager* with an
+*EXTENDED* persistence context injected into a @Stateful bean.  An EJB 3
+*@Entity* bean is used with the EntityManager to create, persist and merge
+data to a database. </td><td>  - javax.ejb.Stateful
+</tr>
+ - javax.persistence.Entity
+ - javax.persistence.EntityManager
+ - javax.persistence.PersistenceContext
+ - javax.persistence.PersistenceContextType.EXTENDED
+ - javax.persistence.Query
+<tr></tr>
+<tr><td> *[Testing Transactions](testing-transactions-example.html)
+* </td><td> Shows use of @PersistenceContext to have an *EntityManager* with an
+*TRANSACTION* persistence context injected into a *@Stateful* bean using
+the *@TransactionAttribute* annotation and a TestCase that runs test code
+in a JTA *Transaction*.  An EJB 3 @Entity bean is used with the
+EntityManager to create, persist and merge data to a database. </td><td>   -
+javax.ejb.Stateful
+</tr>
+ - javax.ejb.Stateless
+ - javax.ejb.TransactionAttribute
+ - javax.ejb.TransactionAttributeType.MANDATORY
+ - javax.ejb.TransactionAttributeType.REQUIRES_NEW
+ - javax.persistence.Entity
+ - javax.persistence.EntityManager
+ - javax.persistence.PersistenceContext
+ - javax.persistence.PersistenceContextType.TRANSACTION
+ - javax.persistence.Query
+<tr></tr>
+<tr><td> *[Testing Security](testing-security-example.html)
+* </td><td> Builds upon the [Injection of EntityManager Example]
+ but adds the use of *@RolesAllowed* and *@PermitAll* in the @Stateful bean
 to restrict who can perform create, persist and remove operations on the
-EntityManager.  Shows a TestCase using the <em>@RunAs</em> annotation 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
-and test the bean code as various users. &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>  -
-java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.annotation.security.PermitAll
-&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>
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.annotation.security.RolesAllowed
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.annotation.security.RunAs
- - 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.EJBAccessE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception
- - 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.Stateful
- - 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.Stateless
- - 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
- - 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.SUPPORTS
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.Entity
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.EntityManager
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.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
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.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.EXTENDED
- - java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.persistence.Query
-<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">tr>
-<tr><td> *<a href="embedded-and-remotable.html">Embedded and Remotable</a>
-* &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> Demonstrates how to use an OpenEJB feature that allows people embedding
+EntityManager.  Shows a TestCase using the *@RunAs* annotation to execute
+and test the bean code as various users. </td><td>  -
+javax.annotation.security.PermitAll
+</tr>
+ - javax.annotation.security.RolesAllowed
+ - javax.annotation.security.RunAs
+ - javax.ejb.EJBAccessException
+ - javax.ejb.Stateful
+ - javax.ejb.Stateless
+ - javax.ejb.TransactionAttribute
+ - javax.ejb.TransactionAttributeType.SUPPORTS
+ - javax.persistence.Entity
+ - javax.persistence.EntityManager
+ - javax.persistence.PersistenceContext
+ - javax.persistence.PersistenceContextType.EXTENDED
+ - javax.persistence.Query
+<tr></tr>
+<tr><td> *[Embedded and Remotable](embedded-and-remotable.html)
+* </td><td> Demonstrates how to use an OpenEJB feature that allows people embedding
 OpenEJB into their applications to support remote clients in other VMs. 
-This is not required for unit testing. &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>  - 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.Remote
-&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>
- - 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.Stateful
-<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">tr>
-<tr><td> *<a href="helloworld-weblogic.html">Helloworld Weblogic</a>
-* &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> Demonstrates OpenEJBs ability to understand and support the WebLogic
+This is not required for unit testing. </td><td>  - javax.ejb.Remote
+</tr>
+ - javax.ejb.Stateful
+<tr></tr>
+<tr><td> *[Helloworld Weblogic](helloworld-weblogic.html)
+* </td><td> Demonstrates OpenEJBs ability to understand and support the WebLogic
 deployment descriptors so people using that platform in production can
 still use OpenEJB in their IDE or build to unit test their EJB
-applications. &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>  - 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.CreateE<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">tr>
- - 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.EJBLocalHome
- - 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.EJBLocalObject
- - 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.LocalHome
- - 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.Stateless
-<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">tr>
-<tr><td> *<a href="jsf-injection-support.html">JSF Injection Support</a>
-* &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> Demonstrates OpenEJBs ability to inject EJB's into JSF managed beans. &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>
- - 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.Stateless
-&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>&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><td> *<a href="struts-with-openejb-and-tomcat.html">Struts with OpenEJB and Tomcat</a>
-* &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> Demonstrates the usage of Struts within an OpenEJB + Tomcat
-environment. &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>   - 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.Stateless
-&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>&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><td> *<a href="applets-with-openejb.html">Applets with OpenEJB</a>
-* &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> Demonstrates how an applet can communicate with a remote stateless
+applications. </td><td>  - javax.ejb.CreateException
+</tr>
+ - javax.ejb.EJBLocalHome
+ - javax.ejb.EJBLocalObject
+ - javax.ejb.LocalHome
+ - javax.ejb.Stateless
+<tr></tr>
+<tr><td> *[JSF Injection Support](jsf-injection-support.html)
+* </td><td> Demonstrates OpenEJBs ability to inject EJB's into JSF managed beans. </td><td>
+ - javax.ejb.Stateless
+</tr>
+<tr></tr>
+<tr><td> *[Struts with OpenEJB and Tomcat](struts-with-openejb-and-tomcat.html)
+* </td><td> Demonstrates the usage of Struts within an OpenEJB + Tomcat
+environment. </td><td>  - javax.ejb.Stateless
+</tr>
+<tr></tr>
+<tr><td> *[Applets with OpenEJB](applets-with-openejb.html)
+* </td><td> Demonstrates how an applet can communicate with a remote stateless
 session bean. The stateless session bean is deployed in an OpenEJB + Tomcat
-environment &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>  - 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.Stateless
-&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>&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>
+environment </td><td>  - javax.ejb.Stateless
+</tr>
+<tr></tr>
 {span}
-&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>
 
             </DIV>
           </P>

Modified: websites/staging/openejb/trunk/content/examples.html
==============================================================================
--- websites/staging/openejb/trunk/content/examples.html (original)
+++ websites/staging/openejb/trunk/content/examples.html Tue Jul 12 18:06:32 2011
@@ -152,16 +152,16 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="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-EJB3E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples">&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="Examples-EJB3Examples"></a></p>
 
-<h1>EJB3 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</h1>
+<h1>EJB3 Examples</h1>
 
-<p>All 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 come with JUnit unit tests that can be run in any IDE, Maven
+<p>All examples come with JUnit unit tests that can be run in any IDE, Maven
 or Ant without special plugins using OpenEJB as an embedded EJB container. 
-The easiest way to run 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 in your IDE is to use maven ({{mvn
+The easiest way to run the examples in your IDE is to use maven ({{mvn
 eclipse:eclipse}} or <em>mvn idea:idea</em>) to generate project descriptors.</p>
 
-<p>{include: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 Table}</p>
+<p>{include:Examples Table}</p>
 
             </DIV>
           </P>