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

Modified: websites/staging/openejb/trunk/content/configuration.html
==============================================================================
--- websites/staging/openejb/trunk/content/configuration.html (original)
+++ websites/staging/openejb/trunk/content/configuration.html Tue Jul 12 18:06:32 2011
@@ -152,11 +152,11 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="Configuration-ShortOverview">&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="Configuration-ShortOverview"></a></p>
 
 <h1>Short Overview</h1>
 
-<p><a name="Configuration-ConfigurationProperties">&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="Configuration-ConfigurationProperties"></a></p>
 
 <h2>Configuration Properties</h2>
 
@@ -179,32 +179,32 @@ webapp, aka. <a href="collapsed-ear.html
 org.openejb.alt.assembler.classic.OpenEjbConfiguration object; implements
 the org.openejb.alt.assembler.classic.OpenEjbConfigurationFactory interface</li>
 <li><em>openejb.descriptors.output</em> - possible values: true|false - When set
-OpenEJB saves deployment descriptors - 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 and openejb-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</li>
+OpenEJB saves deployment descriptors - ejb-jar.xml and openejb-jar.xml</li>
 </ul>
 
-<p><a name="Configuration-ConfigurationFile">&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="Configuration-ConfigurationFile"></a></p>
 
 <h2>Configuration File</h2>
 
 <p>Show a config file with the elements hyperlinked.</p>
 
-<pre><code>&lt;?&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 version="1.0"?&gt;
+<pre><code>&lt;?xml version="1.0"?&gt;
 &lt;openejb&gt;
   &lt;Container id="Default CMP Container" ctype="CMP_ENTITY"&gt;
-    Global_TX_Database  c:&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;my&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;app&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;postgresql.cmp_global_database.&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
-    Local_TX_Database   c:&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;my&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;app&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;postgresql.cmp_local_database.&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
-  &lt;&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;Container&gt;
+    Global_TX_Database  c:/my/app/conf/postgresql.cmp_global_database.xml
+    Local_TX_Database   c:/my/app/conf/postgresql.cmp_local_database.xml
+  &lt;/Container&gt;
   &lt;Connector id="Default JDBC Database"&gt;
     JdbcDriver org.postgresql.Driver
-    JdbcUrl jdbc:postgresql:&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;localhost&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;mydb
+    JdbcUrl jdbc:postgresql://localhost/mydb
     UserName username
     Password password
-  &lt;&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;Connector&gt;
-  &lt;SecurityService id="Default Security Service"&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;&gt;
-  &lt;TransactionService id="Default Transaction Manager"&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;&gt;
-  &lt;Deployments jar="c:&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;my&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;app&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;employee.jar"&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;&gt;
-  &lt;Deployments dir="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"&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;&gt;
-&lt;&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&gt;
+  &lt;/Connector&gt;
+  &lt;SecurityService id="Default Security Service"/&gt;
+  &lt;TransactionService id="Default Transaction Manager"/&gt;
+  &lt;Deployments jar="c:/my/app/employee.jar"/&gt;
+  &lt;Deployments dir="beans/" /&gt;
+&lt;/openejb&gt;
 </code></pre>
 
 <h1>Basic Layout</h1>
@@ -214,7 +214,7 @@ information and third party config files
 whatever).  This includes finding where the, possibly many, <Deployment>
 entries in the openejb.conf point.  The openejb.home is where the code
 loading OpenEJB will look for all the OpenEJB libraries.  Usually
-openejb.base is not e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">plicitly set and defaults to the value of
+openejb.base is not explicitly set and defaults to the value of
 openejb.home, so many people are used to only dealing with openejb.home.</p>
 
 <p>The point of having and openejb.base and openejb.home was basically to
@@ -224,27 +224,27 @@ Server, or even in Groovy as Mr. Stracha
 copy all the OpenEJB system libraries everywhere.</p>
 
 <p><em>openejb.home</em>
-    * can be set e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">plicitly via a system property.
+    * can be set explicitly via a system property.
     * if not set it default's to user.dir, which is the current working
   directory.</p>
 
 <p><em>openejb.base</em>
-    * can be set e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">plicitly via a system property.
+    * can be set explicitly via a system property.
     * If not set it default's to openejb.home.</p>
 
 <p><em>openejb.configuration</em>
-    * can be set 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">plicitly point to the file containing your
+    * can be set to explicitly point to the file containing your
   configuration.
-    * If set to a relative path, we first look in user.dir<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">your-conf-file,
-  then in openejb.base<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">your-conf-file
-    * If not set we check in openejb.base<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">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.conf
+    * If set to a relative path, we first look in user.dir/your-conf-file,
+  then in openejb.base/your-conf-file
+    * If not set we check in openejb.base/conf/openejb.conf
     * If no conf file is found, we create one in
-  openejb.base<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">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.conf</p>
+  openejb.base/conf/openejb.conf</p>
 
 <p><em>relative paths in openejb.conf</em>
     * Deployment entries are resolved relative to openejb.base.
     * Containers use openejb.base to resolve their own config files.  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, Castor JDO to loads the database.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml and all other files from the
+  example, Castor JDO to loads the database.xml and all other files from the
   openejb.base directory.
     * Resource adapters that are embedded usually have config files of their
   own and are also loaded from the openeb.base.</p>
@@ -262,49 +262,49 @@ to the classpath.</p>
 
 <p>A summary of the above in a different notation:</p>
 
-<pre><code>openejb.home = user.dir (can be set 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;plicitly)
-openejb.base = openejb.home (can be set 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;plicitly)
-openejb.conf = openejb.base&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.conf (can be set 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;plicitly)
-logging.conf = openejb.base&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;logging.conf (can be set 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;plicitly)
+<pre><code>openejb.home = user.dir (can be set explicitly)
+openejb.base = openejb.home (can be set explicitly)
+openejb.conf = openejb.base/conf/openejb.conf (can be set explicitly)
+logging.conf = openejb.base/conf/logging.conf (can be set explicitly)
 deployments  = paths listed in openejb.conf (relative paths resolved from openejb.base)
-Classpath includes openejb.home&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 and openejb.home&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;dist
+Classpath includes openejb.home/lib and openejb.home/dist
 </code></pre>
 
-<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">ample layout</h2>
+<h2>Example layout</h2>
 
 <p>In this one the openejb.home and openejb.base are set, everything else is
 defaulted.  The openejb.conf file as been updated to point to the ejb jars
-by name (abc-ejbs.jar and <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yz-ejbs.jar).</p>
+by name (abc-ejbs.jar and xyz-ejbs.jar).</p>
 
-<p>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 layout:</p>
+<p>An example layout:</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;usr&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;local&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.home)
-&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;usr&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;local&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/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;lib  (in classpath)
-&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;usr&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;local&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/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;dist (in classpath)
-&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;home&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;jsmith&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;foo_app  (openejb.base)
-&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;home&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;jsmith&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;foo_app&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.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;home&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;jsmith&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;foo_app&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;logging.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;home&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;jsmith&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;foo_app&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;abc-ejbs.jar (Deployment entry in openejb.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;home&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;jsmith&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;foo_app&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/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;yz-ejbs.jar (Deployment entry in openejb.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;home&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;jsmith&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;foo_app&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;  
+<pre><code>/usr/local/openejb  (openejb.home)
+/usr/local/openejb/lib  (in classpath)
+/usr/local/openejb/dist (in classpath)
+/home/jsmith/foo_app  (openejb.base)
+/home/jsmith/foo_app/conf/openejb.conf
+/home/jsmith/foo_app/conf/logging.conf
+/home/jsmith/foo_app/abc-ejbs.jar (Deployment entry in openejb.conf)
+/home/jsmith/foo_app/xyz-ejbs.jar (Deployment entry in openejb.conf)
+/home/jsmith/foo_app/logs/  
 </code></pre>
 
-<h2>Another 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 layout</h2>
+<h2>Another Example layout</h2>
 
-<p>In 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">ample openejb.home and openejb.base are setup as well as 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">plicit paths for the openejb and log4j configuration files.</p>
+<p>In this example openejb.home and openejb.base are setup as well as the
+explicit paths for the openejb and log4j configuration files.</p>
 
-<p>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 layout:</p>
+<p>An example layout:</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;usr&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;local&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.home)
-&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;usr&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;local&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/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;lib  (in classpath)
-&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;usr&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;local&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/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;dist (in classpath)
-&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;home&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;jsmith&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;foo_app  (openejb.base)
-&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;home&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;jsmith&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;foo_app&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  (openejb.configuration)
-&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;home&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;jsmith&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;foo_app&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;abc-ejbs.jar (Deployment entry in 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)
-&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;home&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;jsmith&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;foo_app&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/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;yz-ejbs.jar (Deployment entry in 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)
-&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;home&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;jsmith&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;foo_app&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;log4j.conf  (log4j.configuration)
-&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;home&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;jsmith&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;foo_app&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;mylogs&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;  (logging dir as defined in log4j.conf)
+<pre><code>/usr/local/openejb  (openejb.home)
+/usr/local/openejb/lib  (in classpath)
+/usr/local/openejb/dist (in classpath)
+/home/jsmith/foo_app  (openejb.base)
+/home/jsmith/foo_app/openejb.xml  (openejb.configuration)
+/home/jsmith/foo_app/abc-ejbs.jar (Deployment entry in openejb.xml)
+/home/jsmith/foo_app/xyz-ejbs.jar (Deployment entry in openejb.xml)
+/home/jsmith/foo_app/log4j.conf  (log4j.configuration)
+/home/jsmith/foo_app/mylogs/  (logging dir as defined in log4j.conf)
 </code></pre>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/configuring-containers-in-tests.html
==============================================================================
--- websites/staging/openejb/trunk/content/configuring-containers-in-tests.html (original)
+++ websites/staging/openejb/trunk/content/configuring-containers-in-tests.html Tue Jul 12 18:06:32 2011
@@ -152,22 +152,22 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p>Like Resources, Containers can also be declared 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
+          <p>Like Resources, Containers can also be declared via InitialContext
 properties as well.  The most useful is to declare a Stateful SessionBean
 container so that it's guaranteed to passivate and activate on each call to
 the bean, allowing you to test your callbacks behave as you need them to.</p>
 
 <pre><code>Properties p = new Properties();
-p.put(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.INITIAL_CONTEXT_FACTORY, "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");
+p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
 
-p.put("myStatefulContainer", "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;Container?type=STATEFUL");
+p.put("myStatefulContainer", "new://Container?type=STATEFUL");
 p.put("myStatefulContainer.PoolSize", "0");
 p.put("myStatefulContainer.BulkPassivate", "1");
 
-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 = 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);
+Context context = new InitialContext(p);
 </code></pre>
 
-<p>Note, this only works when using 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 embed
+<p>Note, this only works when using the LocalInitialContextFactory to embed
 OpenEJB into the vm.  Once embedded, further configuration properties are
 ignored.</p>
 

Modified: websites/staging/openejb/trunk/content/configuring-datasources-in-tests.html
==============================================================================
--- websites/staging/openejb/trunk/content/configuring-datasources-in-tests.html (original)
+++ websites/staging/openejb/trunk/content/configuring-datasources-in-tests.html Tue Jul 12 18:06:32 2011
@@ -152,22 +152,22 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="ConfiguringDataSourcesinTests-InitialConte<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="ConfiguringDataSourcesinTests-InitialContextproperties"></a></p>
 
-<h1>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>InitialContext properties</h1>
 
 <p>You can configure data sources from within your test case (avoiding the
-need for 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 entirely) like so:</p>
+need for an openejb.xml entirely) like so:</p>
 
 <pre><code>Properties p = new Properties();
-p.put(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.INITIAL_CONTEXT_FACTORY, "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");
+p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
 
-p.put("myDataSource", "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");
+p.put("myDataSource", "new://Resource?type=DataSource");
 p.put("myDataSource.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver");
 p.put("myDataSource.JdbcUrl", "jdbc:derby:derbyDB;create=true");
 p.put("myDataSource.JtaManaged", "true");
 
-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 = 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);
+Context context = new InitialContext(p);
 </code></pre>
 
 <p>See <a href="embedded-configuration.html">Embedded Configuration</a>
@@ -176,25 +176,25 @@ Conte&lt;IMG class="emoticon" src="https
 <p>See <a href="containers-and-resources.html">Containers and Resources</a>
  for a full list of supported Resource types and their properties.</p>
 
-<p><a name="ConfiguringDataSourcesinTests-Noteon<jta-data-source>and<non-jta-data-source>">&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="ConfiguringDataSourcesinTests-Noteon<jta-data-source>and<non-jta-data-source>"></a></p>
 
 <h2>Note on <jta-data-source> and <non-jta-data-source></h2>
 
-<p>When configuring DataSources to be used by 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 files, the
+<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. 
 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 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 above, a new DataSource would be generated as 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">act copy
+<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>
 
 <p>When relying on this functionality it is not necessary to specify the name
-of the generated DataSource in the 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 file.</p>
+of the generated DataSource in the persistence.xml file.</p>
 
             </DIV>
           </P>

Modified: websites/staging/openejb/trunk/content/configuring-datasources.html
==============================================================================
--- websites/staging/openejb/trunk/content/configuring-datasources.html (original)
+++ websites/staging/openejb/trunk/content/configuring-datasources.html Tue Jul 12 18:06:32 2011
@@ -152,30 +152,30 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="ConfiguringDataSources-ConfiguringDataSourcesinopenejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml">&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="ConfiguringDataSources-ConfiguringDataSourcesinopenejb.xml"></a></p>
 
-<h2>Configuring DataSources in 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</h2>
+<h2>Configuring DataSources in openejb.xml</h2>
 
-<p>The <em><Resource></em> element is used to configure a <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">.sql.DataSource</em>. It
+<p>The <em><Resource></em> element is used to configure a <em>javax.sql.DataSource</em>. It
 is also used to configure other resources like Timers, Topics, Queues.  We
-will see some 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 of using <Resource> to configure a DataSource.</p>
+will see some examples of using <Resource> to configure a DataSource.</p>
 
 <p>The <Resource> element is designed after @Resource annotation and has
 similar attributes.</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, this annotation in your bean:</p>
+<p>For example, this annotation in your bean:</p>
 
-<pre><code>@Resource(name = "myDerbyDatasource", type = 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;.sql.DataSource.class)
+<pre><code>@Resource(name = "myDerbyDatasource", type = javax.sql.DataSource.class)
 </code></pre>
 
-<p>Would map to a Resource declared in your 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 as follows:</p>
+<p>Would map to a Resource declared in your openejb.xml as follows:</p>
 
-<pre><code>&lt;Resource id="myDerbyDatasource" type="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;.sql.DataSource"&gt;
+<pre><code>&lt;Resource id="myDerbyDatasource" type="javax.sql.DataSource"&gt;
  . . . .
 &lt;Resource&gt;
 </code></pre>
 
-<p>Note that in the <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml element, the <em>type</em> value of <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">.sql.DataSource</em>
+<p>Note that in the xml element, the <em>type</em> value of <em>javax.sql.DataSource</em>
 can abbreviated to just <em>DataSource</em> as follows:</p>
 
 <pre><code>&lt;Resource id="myDerbyDatasource" type="DataSource"&gt;
@@ -185,47 +185,47 @@ can abbreviated to just <em>DataSource</
 
 <p>See <a href="containers-and-resources.html">Containers and Resources</a>
  for a complete list of supported DataSource properties.  See [DataSource Password Encryption]
- for information on specifying non-plain-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 database passwords in your
-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.  See [Common DataSource Configurations]
+ for information on specifying non-plain-text database passwords in your
+openejb.xml file.  See [Common DataSource Configurations]
  for a list of the commonly used databases and their driver configurations.</p>
 
 <p>You may also need data partitioning per customer or depending on any other
 business criteria. That's also an available feature. See <a href="dynamic-datasource.html">Dynamic Datasource</a>
  for more details.</p>
 
-<p><a name="ConfiguringDataSources-JNDInamesforconfiguredDataSources">&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="ConfiguringDataSources-JNDInamesforconfiguredDataSources"></a></p>
 
 <h2>JNDI names for configured DataSources</h2>
 
-<p><a name="ConfiguringDataSources-E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample1">&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="ConfiguringDataSources-Example1"></a></p>
 
-<h3>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 1</h3>
+<h3>Example 1</h3>
 
 <pre><code>&lt;Resource id="Default JDBC Database" type="DataSource"&gt;
    . . . . .
-&lt;&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&gt;
+&lt;/Resource&gt;
 </code></pre>
 
-<p>The global jndi name would be <em>java:openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Resource<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Default JDBC Database</em></p>
+<p>The global jndi name would be <em>java:openejb/Resource/Default JDBC Database</em></p>
 
-<p><a name="ConfiguringDataSources-E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample2">&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="ConfiguringDataSources-Example2"></a></p>
 
-<h3>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 2</h3>
+<h3>Example 2</h3>
 
 <pre><code>&lt;Resource id="Derby Database"  type="DataSource"&gt;
   . . . . .
-&lt;&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&gt;
+&lt;/Resource&gt;
 </code></pre>
 
-<p>The global jndi name would be <em>java:openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Resource<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Derby Database</em></p>
+<p>The global jndi name would be <em>java:openejb/Resource/Derby Database</em></p>
 
-<p><a name="ConfiguringDataSources-ObtainingaDataSource">&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="ConfiguringDataSources-ObtainingaDataSource"></a></p>
 
 <h2>Obtaining a DataSource</h2>
 
 <p>DataSource references in your ejb should get automatically mapped to the
 Resource you declare.  The shortest and easiest rule is that <em>if your
-reference name matches a Resource in your 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, that's the one you
+reference name matches a Resource in your openejb.xml, that's the one you
 get</em>.&nbsp; Essentially, the rules for mapping are as follows.
 1. Name Attribute Match - @Resource with a name attribute matching the
 resource name gets that resource injected
@@ -235,13 +235,13 @@ resource injected
 available gets injected</p>
 
 <p>There are various ways one could obtain a DataSource now.  Lets take 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 Derby.</p>
+example of Derby.</p>
 
-<p>With a Resource declaration in your 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 like this:</p>
+<p>With a Resource declaration in your openejb.xml like this:</p>
 
 <pre><code>&lt;Resource id="myDerbyDatabase"  type="DataSource"&gt;
   . . . . .
-&lt;&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&gt;
+&lt;/Resource&gt;
 </code></pre>
 
 <p>There are several possible ways to refer to it, as follows.</p>
@@ -265,19 +265,19 @@ public class FooBean {
 
 <p><em>OR BY JNDI lookup</em></p>
 
-<pre><code>@Resource(name="myDerbyDatabase", type=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;.sql.DataSource.class)
+<pre><code>@Resource(name="myDerbyDatabase", type=javax.sql.DataSource.class)
 @Stateless
 public class FooBean {
 
-    public void setSessionConte&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(SessionConte&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 sessionConte&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) {
+    public void setSessionContext(SessionContext sessionContext) {
         DataSource dataSource = (DataSource)
-        sessionConte&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("myDerbyDatabase");
+        sessionContext.lookup("myDerbyDatabase");
     }
 
-    public void someOtherMethod() 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 {
-        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();
+    public void someOtherMethod() throws Exception {
+        InitialContext initialContext = new InitialContext();
         DataSource dataSource = (DataSource)
-        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.lookup("java:comp&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;env&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;myDerbyDatabase");
+        initialContext.lookup("java:comp/env/myDerbyDatabase");
     }
 }
 </code></pre>
@@ -285,26 +285,26 @@ public class FooBean {
 <p><em>OR</em></p>
 
 <pre><code>&lt;resource-ref&gt;
-  &lt;res-ref-name&gt;myDerbyDatabase&lt;&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;res-ref-name&gt;
-  &lt;res-type&gt;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;.sql.DataSource&lt;&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;res-type&gt;
-&lt;&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-ref&gt;
+  &lt;res-ref-name&gt;myDerbyDatabase&lt;/res-ref-name&gt;
+  &lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
+&lt;/resource-ref&gt;
 </code></pre>
 
 <p><em>OR</em></p>
 
 <pre><code>&lt;resource-ref&gt;
-   &lt;res-ref-name&gt;jdbc&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;myDerbyDatabase&lt;&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;res-ref-name&gt;
-   &lt;res-type&gt;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;.sql.DataSource&lt;&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;res-type&gt;
-&lt;&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-ref&gt;
+   &lt;res-ref-name&gt;jdbc/myDerbyDatabase&lt;/res-ref-name&gt;
+   &lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
+&lt;/resource-ref&gt;
 </code></pre>
 
 <p><em>OR</em></p>
 
 <pre><code>&lt;resource-ref&gt;
-   &lt;res-ref-name&gt;someOtherName&lt;&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;res-ref-name&gt;
-   &lt;res-type&gt;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;.sql.DataSource&lt;&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;res-type&gt;
-   &lt;mapped-name&gt;myDerbyDatabase&lt;&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;mapped-name&gt;
-&lt;&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-ref&gt;
+   &lt;res-ref-name&gt;someOtherName&lt;/res-ref-name&gt;
+   &lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
+   &lt;mapped-name&gt;myDerbyDatabase&lt;/mapped-name&gt;
+&lt;/resource-ref&gt;
 </code></pre>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/configuring-javamail.html
==============================================================================
--- websites/staging/openejb/trunk/content/configuring-javamail.html (original)
+++ websites/staging/openejb/trunk/content/configuring-javamail.html Tue Jul 12 18:06:32 2011
@@ -152,24 +152,24 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="ConfiguringJavaMail-DeclaringaJavaMailResource">&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="ConfiguringJavaMail-DeclaringaJavaMailResource"></a></p>
 
 <h1>Declaring a JavaMail Resource</h1>
 
 <p>The basics are that any properties listed in the <Resource> element are
 given directly to the javamail provider via
-java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.mail.Session.getDefaultInstance(Properties props).</p>
+javax.mail.Session.getDefaultInstance(Properties props).</p>
 
-<p>Here might be some 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 properties.</p>
+<p>Here might be some example properties.</p>
 
-<pre><code>&lt;Resource id="SuperbizMail" type="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;.mail.Session"&gt;
+<pre><code>&lt;Resource id="SuperbizMail" type="javax.mail.Session"&gt;
    mail.smtp.host=mail.superbiz.org
    mail.smtp.port=25
    mail.transport.protocol=smtp
    mail.smtp.auth=true
    mail.smtp.user=someuser
    password=mypassword
-&lt;&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&gt;
+&lt;/Resource&gt;
 </code></pre>
 
 <p>You can create as many <Resource> entries like this as you wish, they just
@@ -185,8 +185,8 @@ before attempting to use them.
 
 <h1>Overriding</h1>
 
-<p>If you wanted to do a System property or 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 property override
-of 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 mail session, you could do so like this:</p>
+<p>If you wanted to do a System property or InitialContext property override
+of the above example mail session, you could do so like this:</p>
 
 <pre><code>java ... -DSuperbizMail.mail.smtp.host=localhost
 </code></pre>

Modified: websites/staging/openejb/trunk/content/configuring-logging-in-tests.html
==============================================================================
--- websites/staging/openejb/trunk/content/configuring-logging-in-tests.html (original)
+++ websites/staging/openejb/trunk/content/configuring-logging-in-tests.html Tue Jul 12 18:06:32 2011
@@ -152,27 +152,27 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="ConfiguringLogginginTests-embedded.logging.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="ConfiguringLogginginTests-embedded.logging.properties"></a></p>
 
 <h1>embedded.logging.properties</h1>
 
 <p>When in embedded mode OpenEJB uses an embedded.logging.properties file
 packed in our openejb-core jar which use to configure the logging.  This
-logging configuration is a bit lighter than 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">logging.properties
+logging configuration is a bit lighter than the conf/logging.properties
 file created in a full standalone OpenEJB setup.</p>
 
 <p>When searching for any config file in the classpath, multiple files with
-the same name 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">ist.  OpenEJB will always attempt to favor the one
+the same name may exist.  OpenEJB will always attempt to favor the one
 closest to the openejb.base variable.  This variable is set by default to
-the current directory where your vm is e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecuting, which is more than likely
+the current directory where your vm is executing, which is more than likely
 the directory of your current module.  So simply adding a file named
 embedded.logging.properties to your module may be all that you need to
 specify a new logging configuration for your tests.</p>
 
-<p>Alternatively, you can set "openejb.logger.e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ternal" to "true" as a system
-property (will not work as an 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 property).  Then OpenEJB will
+<p>Alternatively, you can set "openejb.logger.external" to "true" as a system
+property (will not work as an InitialContext property).  Then OpenEJB will
 not attempt to configure logging at all and you can configure logging with
-Log4j directly using any of its APIs; <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml, properties, or code.</p>
+Log4j directly using any of its APIs; xml, properties, or code.</p>
 
 <p>There are a couple good reasons for <em>not</em> replacing the
 embedded.logging.properties file.</p>
@@ -185,7 +185,7 @@ the embedded.logging.properties you will
 you upgrade.</li>
 </ol>
 
-<p><a name="ConfiguringLogginginTests-Overriding(recommended)">&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="ConfiguringLogginginTests-Overriding(recommended)"></a></p>
 
 <h1>Overriding (recommended)</h1>
 
@@ -194,11 +194,11 @@ you upgrade.</li>
 embedded.logging.properties is quite good and there is really no need to
 replace it completely if all you want to do is tweak a few values. </p>
 
-<p>You can also put logging tweaks right in your 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>You can also put logging tweaks right in your InitialContext properties
 like so:</p>
 
 <pre><code>Properties p = new Properties();
-p.put(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.INITIAL_CONTEXT_FACTORY, "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");
+p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
 
 p.put("log4j.rootLogger", "fatal,C");
 p.put("log4j.category.OpenEJB", "warn");
@@ -216,7 +216,7 @@ p.put("log4j.category.openjpa", "error")
 p.put("log4j.appender.C", "org.apache.log4j.ConsoleAppender");
 p.put("log4j.appender.C.layout", "org.apache.log4j.SimpleLayout");
 
-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 = 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);
+Context context = new InitialContext(p);
 </code></pre>
 
 <p>Essentially, everything starting with "log4j." gets applied as overrides on
@@ -224,12 +224,12 @@ top of the embedded.logging.properties w
 makes it possible to easily tweak the log levels while debugging a
 particular test.</p>
 
-<p>Note, that 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 can also be supplied in a
+<p>Note, that InitialContext properties can also be supplied in a
 jndi.properties file in the classpath or via system properties. The
 overriding order is as follows: 1 = highest, 4 = 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 in classpath</li>
 <li>system propertes</li>
 <li>embedded.logging.properties in classpath</li>
@@ -238,7 +238,7 @@ overriding order is as follows: 1 = high
 <p>By default there are no logging settings in 1-3, so #4 is the only source
 of logging information.</p>
 
-<p><a name="ConfiguringLogginginTests-Defaultembedded.logging.propertiescontents">&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="ConfiguringLogginginTests-Defaultembedded.logging.propertiescontents"></a></p>
 
 <h1>Default embedded.logging.properties contents</h1>
 
@@ -266,11 +266,11 @@ log4j.appender.C.layout        = org.apa
 versions.  Future versions will follow the same pattern.</p>
 
 <ul>
-<li>[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">svn.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">repos<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">asf<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">tags<IMG class
 ="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.1.1<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">container<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-core<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">main<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="e
 moticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">embedded.logging.properties](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">svn.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">repos<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">asf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb<IM
 G class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tags<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.1.1<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">container<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-core<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">main<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">embedded.logging.properties)</li>
-<li>[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">svn.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">repos<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">asf<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">tags<IMG class
 ="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.1<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">container<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-core<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">main<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="emo
 ticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">embedded.logging.properties](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">svn.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">repos<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">asf<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">tags<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.1<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">container<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-core<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">main<IMG class="emo
 ticon" 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">embedded.logging.properties)</li>
-<li>[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">svn.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">repos<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">asf<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">tags<IMG class
 ="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">container<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-core<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">main<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="emo
 ticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">embedded.logging.properties](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">svn.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">repos<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">asf<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">tags<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">container<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-core<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">main<IMG class="emo
 ticon" 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">embedded.logging.properties)</li>
-<li>[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">svn.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">repos<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">asf<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">tags<IMG class
 ="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0-beta-2<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">container<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-core<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">main<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 cla
 ss="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">embedded.logging.properties](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">svn.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">repos<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">asf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">opene
 jb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tags<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0-beta-2<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">container<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-core<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">main<
 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">embedded.logging.properties)</li>
-<li>[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">svn.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">repos<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">asf<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">tags<IMG class
 ="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0-beta-1<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">container<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-core<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">main<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 cla
 ss="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">embedded.logging.properties](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">svn.apache.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">repos<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">asf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">opene
 jb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tags<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0-beta-1<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">container<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-core<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">main<
 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">embedded.logging.properties)</li>
+<li><a href="http://svn.apache.org/repos/asf/openejb/tags/openejb-3.1.1/container/openejb-core/src/main/resources/embedded.logging.properties">http://svn.apache.org/repos/asf/openejb/tags/openejb-3.1.1/container/openejb-core/src/main/resources/embedded.logging.properties</a></li>
+<li><a href="http://svn.apache.org/repos/asf/openejb/tags/openejb-3.1/container/openejb-core/src/main/resources/embedded.logging.properties">http://svn.apache.org/repos/asf/openejb/tags/openejb-3.1/container/openejb-core/src/main/resources/embedded.logging.properties</a></li>
+<li><a href="http://svn.apache.org/repos/asf/openejb/tags/openejb-3.0/container/openejb-core/src/main/resources/embedded.logging.properties">http://svn.apache.org/repos/asf/openejb/tags/openejb-3.0/container/openejb-core/src/main/resources/embedded.logging.properties</a></li>
+<li><a href="http://svn.apache.org/repos/asf/openejb/tags/openejb-3.0-beta-2/container/openejb-core/src/main/resources/embedded.logging.properties">http://svn.apache.org/repos/asf/openejb/tags/openejb-3.0-beta-2/container/openejb-core/src/main/resources/embedded.logging.properties</a></li>
+<li><a href="http://svn.apache.org/repos/asf/openejb/tags/openejb-3.0-beta-1/container/openejb-core/src/main/resources/embedded.logging.properties">http://svn.apache.org/repos/asf/openejb/tags/openejb-3.0-beta-1/container/openejb-core/src/main/resources/embedded.logging.properties</a></li>
 </ul>
 
             </DIV>