svn commit: r805576 - in /websites/staging/openejb/trunk: ./ content/embedded-configuration.html

[bu...@apache.org]

Author: buildbot
Date: Tue Feb 21 01:57:02 2012
New Revision: 805576

Log:
Staging update by buildbot for openejb

Modified:
    websites/staging/openejb/trunk/   (props changed)
    websites/staging/openejb/trunk/content/embedded-configuration.html

Propchange: websites/staging/openejb/trunk/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Feb 21 01:57:02 2012
@@ -1 +1 @@
-1291548
+1291549

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 Feb 21 01:57:02 2012
@@ -141,21 +141,30 @@
 <h1>Defaults, Overrides and Order</h1>
 
 <p>When booting up OpenEJB for testing via the <code>LocalInitialContextFactory</code>
-there is quite a bit of flexibility to how things are configured.</p>
+or the newer <code>EJBContainer.createEJBContainer()</code> API part of EJB 3.1 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
 sense configuration is all about overriding those defaults.  There are
 several places to put your overrides and an a specific order how they are
-applied.  Here they are in order of preference; 1 = highest, 5 = lowest.</p>
+applied.  Here they are in order of preference; 1 = highest, 5 = lowest.
+<div class="row"><div class="span8">
+<strong>InitialContext</strong></p>
 
 <ol>
 <li>InitialContext properties</li>
 <li>jndi.properties from the classpath</li>
 <li>System properties</li>
 <li>openejb.xml declarations/properties</li>
-<li>service-jar.xml declarations/properties (internal concept, no need to
-worry about it)</li>
+<li>service-jar.xml declarations/properties (internal concept)</div>
+<div class="span8">
+<strong>EJBContainer API</strong></li>
+<li>EJBContainer.createEJBContainer(Map) entries</li>
+<li>System properties</li>
+<li>openejb.xml declarations/properties</li>
+<li>service-jar.xml declarations/properties (internal concept)
+</div></div></li>
 </ol>
 
 <p>It opens up some interesting possibilities in how you configure your