You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/02/21 03:14:06 UTC
svn commit: r805581 - in /websites/production/openejb: ./
content/configuring-datasources-in-tests.html
content/configuring-persistenceunits-in-tests.html
content/embedded-configuration.html
Author: dblevins
Date: Tue Feb 21 02:14:05 2012
New Revision: 805581
Log:
Publishing merge to openejb site by dblevins
Modified:
websites/production/openejb/ (props changed)
websites/production/openejb/content/configuring-datasources-in-tests.html
websites/production/openejb/content/configuring-persistenceunits-in-tests.html
websites/production/openejb/content/embedded-configuration.html
Propchange: websites/production/openejb/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Feb 21 02:14:05 2012
@@ -1 +1 @@
-1291544
+1291550
Propchange: websites/production/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 21 02:14:05 2012
@@ -1 +1 @@
-/websites/staging/openejb/trunk:790824-805573
+/websites/staging/openejb/trunk:790824-805580
Modified: websites/production/openejb/content/configuring-datasources-in-tests.html
==============================================================================
--- websites/production/openejb/content/configuring-datasources-in-tests.html (original)
+++ websites/production/openejb/content/configuring-datasources-in-tests.html Tue Feb 21 02:14:05 2012
@@ -141,7 +141,7 @@
<h1>InitialContext properties</h1>
<p>You can configure data sources from within your test case (avoiding the
-need for an openejb.xml entirely) like so:</p>
+need for an <code>openejb.xml</code> entirely) like so:</p>
<pre><code>Properties p = new Properties();
p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
@@ -162,23 +162,23 @@ Context context = new InitialContext(p);
<p><a name="ConfiguringDataSourcesinTests-Noteon<jta-data-source>and<non-jta-data-source>"></a></p>
-<h2>Note on <jta-data-source> and <non-jta-data-source></h2>
+<h2>Note on <jta-data-source> and <non-jta-data-source></h2>
<p>When configuring DataSources to be used by persistence.xml files, the
-DataSource supplied for <jta-data-source> is typically identical to the
-<non-jta-data-source>, but with the JtaManaged property set differently.
+DataSource supplied for <code><jta-data-source></code> is typically identical to the
+<code><non-jta-data-source></code>, but with the <code>JtaManaged</code> property set differently.
Keeping with our philosophy to free you up from redundant configuration, we
will happily auto-create a missing jta-data-source or non-jta-data-source
based upon the supplied DataSource.</p>
<p>In the example above, a new DataSource would be generated as an exact copy
-but with the name "myDataSourceUnmanaged" and its JtaManaged flag set to
-false. If the supplied DataSource was not JtaManaged, then the generated
-DataSource would be called "myDataSourceJta" and have its JtaManaged flag
-set to true.</p>
+but with the name "myDataSourceUnmanaged" and its <code>JtaManaged</code> flag set to
+<code>false</code>. If the supplied DataSource was not <code>JtaManaged</code>, then the generated
+DataSource would be called "myDataSourceJta" and have its <code>JtaManaged</code> flag
+set to <code>true</code>.</p>
<p>When relying on this functionality it is not necessary to specify the name
-of the generated DataSource in the persistence.xml file.</p>
+of the generated DataSource in the <code>persistence.xml</code> file.</p>
Modified: websites/production/openejb/content/configuring-persistenceunits-in-tests.html
==============================================================================
--- websites/production/openejb/content/configuring-persistenceunits-in-tests.html (original)
+++ websites/production/openejb/content/configuring-persistenceunits-in-tests.html Tue Feb 21 02:14:05 2012
@@ -145,7 +145,7 @@ alter your persistence.xml for a test en
<p><a name="ConfiguringPersistenceUnitsinTests-Overridingthe<jta-data-source>and<non-jta-data-source>"></a></p>
-<h2>Overriding the <jta-data-source> and <non-jta-data-source></h2>
+<h2>Overriding the $lt;jta-data-source> and $lt;non-jta-data-source></h2>
<p>OpenEJB will automatically use the DataSources you have setup in your test
environment, we're pretty good at guessing the right DataSources you intend
@@ -160,7 +160,7 @@ if we had to adjust the DataSources of y
<p><a name="ConfiguringPersistenceUnitsinTests-Overridingthepersistence-unit<properties>"></a></p>
-<h2>Overriding the persistence-unit <properties></h2>
+<h2>Overriding the persistence-unit $lt;properties></h2>
<p>You can override any property in your test setup via either system
properties or the initial context properties. The format is:</p>
@@ -197,11 +197,12 @@ context = new InitialContext(p);
<p>The overriding order is as follows: 1 = highest, 4 = lowest.</p>
-<pre><code># InitialContext properties
-# jndi.properties from the classpath
-# System properties
-# persistence.xml properties
-</code></pre>
+<ol>
+<li>InitialContext properties</li>
+<li>jndi.properties from the classpath</li>
+<li>System properties</li>
+<li>persistence.xml properties</li>
+</ol>
<p>By default there are no overrides in 1-3, so #4 is the only source of
information. </p>
Modified: websites/production/openejb/content/embedded-configuration.html
==============================================================================
--- websites/production/openejb/content/embedded-configuration.html (original)
+++ websites/production/openejb/content/embedded-configuration.html Tue Feb 21 02:14:05 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