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

Modified: websites/staging/openejb/trunk/content/openjpa.html
==============================================================================
--- websites/staging/openejb/trunk/content/openjpa.html (original)
+++ websites/staging/openejb/trunk/content/openjpa.html Tue Jul 12 18:06:32 2011
@@ -154,89 +154,89 @@
             <DIV id="PageContent">
           <p>OpenJPA is bundled with OpenEJB as the default persistence provider.</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 of  working 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 for OpenJPA:</p>
+<p>An example of  working persistence.xml for OpenJPA:</p>
 
-<pre><code>&lt;persistence &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;mlns="http:&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;java.sun.com&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;ml&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alig
 n="absmiddle" alt="" border="0"&gt;ns&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;persistence" version="1.0"&gt;
+<pre><code>&lt;persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0"&gt;
 
   &lt;persistence-unit name="movie-unit"&gt;
-    &lt;jta-data-source&gt;movieDatabase&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;jta-data-source&gt;
-    &lt;non-jta-data-source&gt;movieDatabaseUnmanaged&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;non-jta-data-source&gt;
-    &lt;class&gt;org.superbiz.injection.jpa.Movie&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;class&gt;
+    &lt;jta-data-source&gt;movieDatabase&lt;/jta-data-source&gt;
+    &lt;non-jta-data-source&gt;movieDatabaseUnmanaged&lt;/non-jta-data-source&gt;
+    &lt;class&gt;org.superbiz.injection.jpa.Movie&lt;/class&gt;
 
     &lt;properties&gt;
       &lt;property name="openjpa.jdbc.SynchronizeMappings"
-value="buildSchema(ForeignKeys=true)"&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;properties&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;persistence-unit&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;persistence&gt;
+value="buildSchema(ForeignKeys=true)"/&gt;
+    &lt;/properties&gt;
+  &lt;/persistence-unit&gt;
+&lt;/persistence&gt;
 </code></pre>
 
-<p>Where the datasources above are configured 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>Where the datasources above are configured in your openejb.xml as follows:</p>
 
 <pre><code>&lt;Resource id="movieDatabase" type="DataSource"&gt;
   JdbcDriver = org.hsqldb.jdbcDriver
   JdbcUrl = jdbc:hsqldb:mem:moviedb
-&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;
 
 &lt;Resource id="movieDatabaseUnmanaged" type="DataSource"&gt;
   JdbcDriver = org.hsqldb.jdbcDriver
   JdbcUrl = jdbc:hsqldb:mem:moviedb
   JtaManaged = false
-&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>Or in properties as follows:</p>
 
-<pre><code>p.put("movieDatabase", "new:&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Resource?type=DataSource");
+<pre><code>p.put("movieDatabase", "new://Resource?type=DataSource");
 p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
 p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
 
-p.put("movieDatabaseUnmanaged", "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("movieDatabaseUnmanaged", "new://Resource?type=DataSource");
 p.put("movieDatabaseUnmanaged.JdbcDriver", "org.hsqldb.jdbcDriver");
 p.put("movieDatabaseUnmanaged.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
 p.put("movieDatabaseUnmanaged.JtaManaged", "false");
 </code></pre>
 
-<h1>Common e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ceptions</h1>
+<h1>Common exceptions</h1>
 
 <h2>Table not found in statement</h2>
 
-<p>Or as derby will report it "Table 'abc.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yz' doesn't 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"</p>
+<p>Or as derby will report it "Table 'abc.xyz' doesn't exist"</p>
 
 <p>Someone has to create the database structure for your persistent objects.
 If you add the <em>openjpa.jdbc.SynchronizeMappings</em> property as shown below
 OpenJPA will auto-create all your tables, all your primary keys and all
-foreign keys e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">actly to match your objects.</p>
+foreign keys exactly to match your objects.</p>
 
-<pre><code>&lt;persistence &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;mlns="http:&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;java.sun.com&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;ml&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alig
 n="absmiddle" alt="" border="0"&gt;ns&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;persistence" version="1.0"&gt;
+<pre><code>&lt;persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0"&gt;
 
  &lt;persistence-unit name="movie-unit"&gt;
    &lt;!-- your other stuff --&gt;
 
    &lt;properties&gt;
-     &lt;property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"&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;properties&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;persistence-unit&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;persistence&gt;
+     &lt;property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/&gt;
+   &lt;/properties&gt;
+ &lt;/persistence-unit&gt;
+&lt;/persistence&gt;
 </code></pre>
 
-<p><a name="OpenJPA-Auto-commitcannotbesetwhileenrolledinatransaction">&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="OpenJPA-Auto-commitcannotbesetwhileenrolledinatransaction"></a></p>
 
 <h2>Auto-commit can not be set while enrolled in a transaction</h2>
 
 <p>Pending</p>
 
-<p><a name="OpenJPA-Thisbrokerisnotconfiguredtousemanagedtransactions.">&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="OpenJPA-Thisbrokerisnotconfiguredtousemanagedtransactions."></a></p>
 
 <h2>This broker is not configured to use managed transactions.</h2>
 
-<p><a name="OpenJPA-Setup">&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="OpenJPA-Setup"></a></p>
 
 <h3>Setup</h3>
 
-<p>Using a EXTENDED persistence conte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t ...</p>
+<p>Using a EXTENDED persistence context ...</p>
 
-<pre><code>@PersistenceConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t(unitName = "movie-unit", type = PersistenceConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;tType.EXTENDED)
+<pre><code>@PersistenceContext(unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
 EntityManager entityManager;
 </code></pre>
 
@@ -244,21 +244,21 @@ EntityManager entityManager;
 
 <pre><code>&lt;persistence-unit name="movie-unit" transaction-type="RESOURCE_LOCAL"&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;persistence-unit&gt;
+&lt;/persistence-unit&gt;
 </code></pre>
 
 <p>inside of a transaction.</p>
 
 <pre><code>@TransactionAttribute(TransactionAttributeType.REQUIRED)
-public void addMovie(Movie movie) throws E&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ception {
+public void addMovie(Movie movie) throws Exception {
     entityManager.persist(movie);
 }
 </code></pre>
 
 <p>Note the default transaction attribute for any ejb method is REQUIRED
-unless 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 otherwise in the bean class or method in question.</p>
+unless explicitly set otherwise in the bean class or method in question.</p>
 
-<p><a name="OpenJPA-Solutions">&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="OpenJPA-Solutions"></a></p>
 
 <h3>Solutions</h3>
 
@@ -266,7 +266,7 @@ unless e<IMG class="emoticon" src="https
 1. Change your bean or it's method to use
 TransactionAttributeType.NOT_REQUIRED or TransactionAttributeType.NEVER
 which will guarantee it will not be invoked in a JTA transaction.
-1. Change your 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 so the persistence-unit uses
+1. Change your persistence.xml so the persistence-unit uses
 transaction-type="TRANSACTION" making it capable of participating in a JTA
 transaction.</p>
 

Modified: websites/staging/openejb/trunk/content/persistence-context.html
==============================================================================
--- websites/staging/openejb/trunk/content/persistence-context.html (original)
+++ websites/staging/openejb/trunk/content/persistence-context.html Tue Jul 12 18:06:32 2011
@@ -152,60 +152,60 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="persistence-conte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t-Viaannotation">&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="persistence-context-Viaannotation"></a></p>
 
 <h1>Via annotation</h1>
 
 <p>Both lookup and injection of an EntityManager can be configured via the
-<code>@PersistenceConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t</code> annotation.</p>
+<code>@PersistenceContext</code> annotation.</p>
 
 <pre><code>package org.superbiz;
 
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.persistence.PersistenceConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.persistence.EntityManager;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.ejb.Stateless;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.naming.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;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
 
 @Stateless
-@PersistenceConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t(name = "myFooEntityManager", unitName = "foo-unit")
+@PersistenceContext(name = "myFooEntityManager", unitName = "foo-unit")
 public class MyBean implements MyInterface {
 
-    @PersistenceConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t(unitName = "bar-unit")
+    @PersistenceContext(unitName = "bar-unit")
     private EntityManager myBarEntityManager;
 
-    public void someBusinessMethod() 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 {
-        if (myBarEntityManager == null) throw new NullPointerE&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("myBarEntityManager not injected");
+    public void someBusinessMethod() throws Exception {
+        if (myBarEntityManager == null) throw new NullPointerException("myBarEntityManager not injected");
 
-        &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; Both can be looked up from JNDI as well
-        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 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();
-        EntityManager fooEntityManager = (EntityManager) conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t.lookup("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;myFooEntityManager");
-        EntityManager barEntityManager = (EntityManager) conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t.lookup("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;org.superbiz.MyBean&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;myBarEntityManager");
+        // Both can be looked up from JNDI as well
+        InitialContext context = new InitialContext();
+        EntityManager fooEntityManager = (EntityManager) context.lookup("java:comp/env/myFooEntityManager");
+        EntityManager barEntityManager = (EntityManager) context.lookup("java:comp/env/org.superbiz.MyBean/myBarEntityManager");
     }
 }
 </code></pre>
 
-<p><a name="persistence-conte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t-Via<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="persistence-context-Viaxml"></a></p>
 
-<h1>Via <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml</h1>
+<h1>Via xml</h1>
 
-<p>The above @PersistenceConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t annotation usage is 100% equivalent to the
-following <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml.</p>
+<p>The above @PersistenceContext annotation usage is 100% equivalent to the
+following xml.</p>
 
-<pre><code>&lt;persistence-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-ref&gt;
-    &lt;persistence-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-ref-name&gt;myFooEntityManager&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;persistence-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-ref-name&gt;
-    &lt;persistence-unit-name&gt;foo-unit&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;persistence-unit-name&gt;
-    &lt;persistence-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-type&gt;Transaction&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;persistence-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-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;persistence-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-ref&gt;
-
-&lt;persistence-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-ref&gt;
-    &lt;persistence-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-ref-name&gt;org.superbiz.calculator.MyBean&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;myBarEntityManager&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;persistence-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-ref-name&gt;
-    &lt;persistence-unit-name&gt;bar-unit&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;persistence-unit-name&gt;
-    &lt;persistence-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-type&gt;Transaction&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;persistence-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-type&gt;
+<pre><code>&lt;persistence-context-ref&gt;
+    &lt;persistence-context-ref-name&gt;myFooEntityManager&lt;/persistence-context-ref-name&gt;
+    &lt;persistence-unit-name&gt;foo-unit&lt;/persistence-unit-name&gt;
+    &lt;persistence-context-type&gt;Transaction&lt;/persistence-context-type&gt;
+&lt;/persistence-context-ref&gt;
+
+&lt;persistence-context-ref&gt;
+    &lt;persistence-context-ref-name&gt;org.superbiz.calculator.MyBean/myBarEntityManager&lt;/persistence-context-ref-name&gt;
+    &lt;persistence-unit-name&gt;bar-unit&lt;/persistence-unit-name&gt;
+    &lt;persistence-context-type&gt;Transaction&lt;/persistence-context-type&gt;
     &lt;injection-target&gt;
-        &lt;injection-target-class&gt;org.superbiz.calculator.MyBean&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;injection-target-class&gt;
-        &lt;injection-target-name&gt;myBarEntityManager&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;injection-target-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;injection-target&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;persistence-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-ref&gt;
+        &lt;injection-target-class&gt;org.superbiz.calculator.MyBean&lt;/injection-target-class&gt;
+        &lt;injection-target-name&gt;myBarEntityManager&lt;/injection-target-name&gt;
+    &lt;/injection-target&gt;
+&lt;/persistence-context-ref&gt;
 </code></pre>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/persistence-unit-ref.html
==============================================================================
--- websites/staging/openejb/trunk/content/persistence-unit-ref.html (original)
+++ websites/staging/openejb/trunk/content/persistence-unit-ref.html Tue Jul 12 18:06:32 2011
@@ -153,23 +153,23 @@
             <!-- $BODY -->
             <DIV id="PageContent">
           <p>Both lookup and injection of an EntityManagerFactory can be configured via
-the @PersistenceUnit annotation or <persistence-unit-ref> in <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml. 
-Annotations and <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml have equal function in both lookup and injection.</p>
+the @PersistenceUnit annotation or <persistence-unit-ref> in xml. 
+Annotations and xml have equal function in both lookup and injection.</p>
 
-<p><a name="persistence-unit-ref-InjectionandLookup">&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="persistence-unit-ref-InjectionandLookup"></a></p>
 
 <h1>Injection and Lookup</h1>
 
-<p><a name="persistence-unit-ref-Viaannotation">&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="persistence-unit-ref-Viaannotation"></a></p>
 
 <h2>Via annotation</h2>
 
 <pre><code>package org.superbiz;
 
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.persistence.PersistenceUnit;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.persistence.EntityManagerFactory;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.ejb.Stateless;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.naming.InitialUnit;
+import javax.persistence.PersistenceUnit;
+import javax.persistence.EntityManagerFactory;
+import javax.ejb.Stateless;
+import javax.naming.InitialUnit;
 
 @Stateless
 public class MyBean implements MyInterface {
@@ -177,32 +177,32 @@ public class MyBean implements MyInterfa
     @PersistenceUnit(unitName = "bar-unit")
     private EntityManagerFactory myBarEntityManagerFactory;
 
-    public void someBusinessMethod() 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 {
-        if (myBarEntityManagerFactory == null) throw new NullPointerE&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("myBarEntityManagerFactory not injected");
+    public void someBusinessMethod() throws Exception {
+        if (myBarEntityManagerFactory == null) throw new NullPointerException("myBarEntityManagerFactory not injected");
 
-        &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; Both can be looked up from JNDI as well
-        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 unit = 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();
-        EntityManagerFactory barEntityManagerFactory = (EntityManagerFactory) conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t.lookup("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;org.superbiz.MyBean&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;myBarEntityManagerFactory");
+        // Both can be looked up from JNDI as well
+        InitialContext unit = new InitialContext();
+        EntityManagerFactory barEntityManagerFactory = (EntityManagerFactory) context.lookup("java:comp/env/org.superbiz.MyBean/myBarEntityManagerFactory");
     }
 }
 </code></pre>
 
-<p><a name="persistence-unit-ref-Via<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="persistence-unit-ref-Viaxml"></a></p>
 
-<h2>Via <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>Via xml</h2>
 
 <p>The above @PersistenceUnit annotation usage is 100% equivalent to the
-following <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml.</p>
+following xml.</p>
 
 <pre><code>&lt;persistence-unit-ref&gt;
-    &lt;persistence-unit-ref-name&gt;org.superbiz.calculator.MyBean&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;myBarEntityManagerFactory&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;persistence-unit-ref-name&gt;
-    &lt;persistence-unit-name&gt;bar-unit&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;persistence-unit-name&gt;
-    &lt;persistence-unit-type&gt;Transaction&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;persistence-unit-type&gt;
+    &lt;persistence-unit-ref-name&gt;org.superbiz.calculator.MyBean/myBarEntityManagerFactory&lt;/persistence-unit-ref-name&gt;
+    &lt;persistence-unit-name&gt;bar-unit&lt;/persistence-unit-name&gt;
+    &lt;persistence-unit-type&gt;Transaction&lt;/persistence-unit-type&gt;
     &lt;injection-target&gt;
-        &lt;injection-target-class&gt;org.superbiz.calculator.MyBean&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;injection-target-class&gt;
-        &lt;injection-target-name&gt;myBarEntityManagerFactory&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;injection-target-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;injection-target&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;persistence-unit-ref&gt;
+        &lt;injection-target-class&gt;org.superbiz.calculator.MyBean&lt;/injection-target-class&gt;
+        &lt;injection-target-name&gt;myBarEntityManagerFactory&lt;/injection-target-name&gt;
+    &lt;/injection-target&gt;
+&lt;/persistence-unit-ref&gt;
 </code></pre>
 
 <h1>Lookup only</h1>
@@ -211,34 +211,34 @@ following <IMG class="emoticon" src="htt
 
 <pre><code>package org.superbiz;
 
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.persistence.PersistenceUnit;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.persistence.EntityManagerFactory;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.ejb.Stateless;
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.naming.InitialUnit;
+import javax.persistence.PersistenceUnit;
+import javax.persistence.EntityManagerFactory;
+import javax.ejb.Stateless;
+import javax.naming.InitialUnit;
 
 @Stateless
 @PersistenceUnit(name = "myFooEntityManagerFactory", unitName = "foo-unit")
 public class MyBean implements MyInterface {
 
-    public void someBusinessMethod() 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 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();
-        EntityManagerFactory fooEntityManagerFactory = (EntityManagerFactory) conte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t.lookup("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;myFooEntityManagerFactory");
+    public void someBusinessMethod() throws Exception {
+        InitialContext context = new InitialContext();
+        EntityManagerFactory fooEntityManagerFactory = (EntityManagerFactory) context.lookup("java:comp/env/myFooEntityManagerFactory");
     }
 }
 </code></pre>
 
-<p><a name="persistence-unit-ref-Via<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="persistence-unit-ref-Viaxml"></a></p>
 
-<h1>Via <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml</h1>
+<h1>Via xml</h1>
 
 <p>The above @PersistenceUnit annotation usage is 100% equivalent to the
-following <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml.</p>
+following xml.</p>
 
 <pre><code>&lt;persistence-unit-ref&gt;
-    &lt;persistence-unit-ref-name&gt;myFooEntityManagerFactory&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;persistence-unit-ref-name&gt;
-    &lt;persistence-unit-name&gt;foo-unit&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;persistence-unit-name&gt;
-    &lt;persistence-unit-type&gt;Transaction&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;persistence-unit-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;persistence-unit-ref&gt;
+    &lt;persistence-unit-ref-name&gt;myFooEntityManagerFactory&lt;/persistence-unit-ref-name&gt;
+    &lt;persistence-unit-name&gt;foo-unit&lt;/persistence-unit-name&gt;
+    &lt;persistence-unit-type&gt;Transaction&lt;/persistence-unit-type&gt;
+&lt;/persistence-unit-ref&gt;
 </code></pre>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/privacy-policy.html
==============================================================================
--- websites/staging/openejb/trunk/content/privacy-policy.html (original)
+++ websites/staging/openejb/trunk/content/privacy-policy.html Tue Jul 12 18:06:32 2011
@@ -164,8 +164,8 @@ following:</p>
 <li>The addresses of pages from where you followed a link to our site.</li>
 </ol>
 
-<p>Part of this information is gathered using a tracking cookie set by the [Google Analytics](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">www.google.com<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">analytics<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">)
- service and handled by Google as described in their [privacy policy|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">www.google.com<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">privacy.html]
+<p>Part of this information is gathered using a tracking cookie set by the <a href="http://www.google.com/analytics/">Google Analytics</a>
+ service and handled by Google as described in their [privacy policy|http://www.google.com/privacy.html]
 . See your browser documentation for instructions on how to disable the
 cookie if you prefer not to share this data with Google.</p>
 

Modified: websites/staging/openejb/trunk/content/properties-tool.html
==============================================================================
--- websites/staging/openejb/trunk/content/properties-tool.html (original)
+++ websites/staging/openejb/trunk/content/properties-tool.html Tue Jul 12 18:06:32 2011
@@ -152,7 +152,7 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="PropertiesTool-PropertiesCommandlineTool">&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="PropertiesTool-PropertiesCommandlineTool"></a></p>
 
 <h1>Properties Command line Tool</h1>
 
@@ -160,53 +160,53 @@
 tool against a running server:</p>
 
 <blockquote>
-  <p>.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">bin<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb properties</p>
+  <p>./bin/openejb properties</p>
 </blockquote>
 
 <p>The output of this tool takes all overrideable components OpenEJB sees and
 outputs their properties along with the current value.  This allows you to
 easily see what is running in your system, what properties are available
-for overriding, and what 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 values are for each component.  OpenEJB has
+for overriding, and what exact values are for each component.  OpenEJB has
 a number of flags that can be passed to it not associated with any
 particular component, these are output as well.</p>
 
 <p>Content from this file can be safely copied as-is into 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">system.properties file or sent to the users list with bug reports. 
-These properties may also be applied back into the 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 by
-pasting the properties without the "<id>." prefi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> into the respective
+conf/system.properties file or sent to the users list with bug reports. 
+These properties may also be applied back into the openejb.xml file by
+pasting the properties without the "<id>." prefix into the respective
 component declarations.  The only warning is that any properties of type
 "<id>.password" will have their values masked, so make sure you edit them
-if you reapply them back into 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.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml or conf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">system.properties.</p>
+if you reapply them back into conf/openejb.xml or conf/system.properties.</p>
 
-<p><a name="PropertiesTool-PropertyOverriding">&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="PropertiesTool-PropertyOverriding"></a></p>
 
 <h1>Property Overriding</h1>
 
-<p>Any component configured in OpenEJB via the 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 (and some that
+<p>Any component configured in OpenEJB via the openejb.xml (and some that
 aren't) can be overridden using system properties.  The format is:</p>
 
 <p><code>&lt;id&gt;.&lt;property-name&gt;=&lt;property-value&gt;</code></p>
 
 <p>And this can be done on the command line as follows:</p>
 
-<p><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;bin&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb -D&lt;id&gt;.&lt;property-name&gt;=&lt;property-value&gt; ...</code></p>
+<p><code>./bin/openejb -D&lt;id&gt;.&lt;property-name&gt;=&lt;property-value&gt; ...</code></p>
 
-<p>Or by adding the property to 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">system.properties file.  Note that
+<p>Or by adding the property to the conf/system.properties file.  Note that
 command line overrides win over overrides in 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">system.properties file.</p>
+conf/system.properties file.</p>
 
 <p>In an embedded environment, the properties can be added to the Hashtable
-passed into the java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.naming.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 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 or also to the System.getProperties() object
-before OpenEJB is embedded (which will be when the first 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 is
+passed into the javax.naming.InitialContext when using the
+LocalInitialContextFactory or also to the System.getProperties() object
+before OpenEJB is embedded (which will be when the first InitialContext is
 created).</p>
 
 <p>At startup, OpenEJB will find the component with the given id and apply the
 new property value before constructing the individual component.</p>
 
-<p><a name="PropertiesTool-E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ampleoutput">&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="PropertiesTool-Exampleoutput"></a></p>
 
-<h1>E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample output</h1>
+<h1>Example output</h1>
 
 <pre><code># Container(id=Default CMP Container)
 # className: org.apache.openejb.core.cmp.CmpContainer
@@ -240,7 +240,7 @@ Default\ Stateless\ Container.TimeOut=0
 #
 Default\ MDB\ Container.ResourceAdapter=Default JMS Resource Adapter
 Default\ MDB\ Container.InstanceLimit=10
-Default\ MDB\ Container.MessageListenerInterface=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;.jms.MessageListener
+Default\ MDB\ Container.MessageListenerInterface=javax.jms.MessageListener
 Default\ MDB\ Container.ActivationSpecClass=org.apache.activemq.ra.ActiveMQActivationSpec
 
 # ConnectionManager(id=Default Local TX ConnectionManager)
@@ -250,30 +250,30 @@ Default\ MDB\ Container.ActivationSpecCl
 # Resource(id=Default JMS Resource Adapter)
 # className: org.apache.activemq.ra.ActiveMQResourceAdapter
 #
-Default\ JMS\ Resource\ Adapter.ServerUrl=vm\:&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?async\=true
-Default\ JMS\ Resource\ Adapter.BrokerXmlConfig=broker\:(tcp\:&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\:61616)
+Default\ JMS\ Resource\ Adapter.ServerUrl=vm\://localhost?async\=true
+Default\ JMS\ Resource\ Adapter.BrokerXmlConfig=broker\:(tcp\://localhost\:61616)
 Default\ JMS\ Resource\ Adapter.ThreadPoolSize=30
 
 # Resource(id=Default JDBC Database)
 # className: org.apache.openejb.resource.jdbc.BasicManagedDataSource
 #
 Default\ JDBC\ Database.MinIdle=0
-Default\ JDBC\ Database.Password=&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;&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;&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;&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;
+Default\ JDBC\ Database.Password=xxxx
 Default\ JDBC\ Database.JdbcUrl=jdbc\:hsqldb\:file\:hsqldb
-Default\ JDBC\ Database.Ma&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;Idle=20
+Default\ JDBC\ Database.MaxIdle=20
 Default\ JDBC\ Database.ConnectionProperties=
-Default\ JDBC\ Database.Ma&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;Wait=-1
+Default\ JDBC\ Database.MaxWait=-1
 Default\ JDBC\ Database.TimeBetweenEvictionRunsMillis=-1
-Default\ JDBC\ Database.Ma&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;Active=20
+Default\ JDBC\ Database.MaxActive=20
 Default\ JDBC\ Database.DefaultAutoCommit=true
 Default\ JDBC\ Database.AccessToUnderlyingConnectionAllowed=false
 Default\ JDBC\ Database.JdbcDriver=org.hsqldb.jdbcDriver
 Default\ JDBC\ Database.TestWhileIdle=false
 Default\ JDBC\ Database.UserName=sa
-Default\ JDBC\ Database.Ma&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;OpenPreparedStatements=0
+Default\ JDBC\ Database.MaxOpenPreparedStatements=0
 Default\ JDBC\ Database.TestOnBorrow=true
 Default\ JDBC\ Database.PoolPreparedStatements=false
-Default\ JDBC\ Database.ConnectionInterface=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
+Default\ JDBC\ Database.ConnectionInterface=javax.sql.DataSource
 Default\ JDBC\ Database.TestOnReturn=false
 Default\ JDBC\ Database.MinEvictableIdleTimeMillis=1800000
 Default\ JDBC\ Database.NumTestsPerEvictionRun=3
@@ -282,33 +282,33 @@ Default\ JDBC\ Database.InitialSize=0
 # Resource(id=Default Unmanaged JDBC Database)
 # className: org.apache.openejb.resource.jdbc.BasicDataSource
 #
-Default\ Unmanaged\ JDBC\ Database.Ma&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;Wait=-1
+Default\ Unmanaged\ JDBC\ Database.MaxWait=-1
 Default\ Unmanaged\ JDBC\ Database.InitialSize=0
 Default\ Unmanaged\ JDBC\ Database.DefaultAutoCommit=true
 Default\ Unmanaged\ JDBC\ Database.ConnectionProperties=
-Default\ Unmanaged\ JDBC\ Database.Ma&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;Active=10
+Default\ Unmanaged\ JDBC\ Database.MaxActive=10
 Default\ Unmanaged\ JDBC\ Database.TestOnBorrow=true
 Default\ Unmanaged\ JDBC\ Database.JdbcUrl=jdbc\:hsqldb\:file\:hsqldb
 Default\ Unmanaged\ JDBC\ Database.TestOnReturn=false
 Default\ Unmanaged\ JDBC\ Database.AccessToUnderlyingConnectionAllowed=false
-Default\ Unmanaged\ JDBC\ Database.Password=&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;&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;&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;&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;
+Default\ Unmanaged\ JDBC\ Database.Password=xxxx
 Default\ Unmanaged\ JDBC\ Database.MinEvictableIdleTimeMillis=1800000
 Default\ Unmanaged\ JDBC\ Database.PoolPreparedStatements=false
-Default\ Unmanaged\ JDBC\ Database.Ma&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;OpenPreparedStatements=0
-Default\ Unmanaged\ JDBC\ Database.ConnectionInterface=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
+Default\ Unmanaged\ JDBC\ Database.MaxOpenPreparedStatements=0
+Default\ Unmanaged\ JDBC\ Database.ConnectionInterface=javax.sql.DataSource
 Default\ Unmanaged\ JDBC\ Database.MinIdle=0
 Default\ Unmanaged\ JDBC\ Database.NumTestsPerEvictionRun=3
 Default\ Unmanaged\ JDBC\ Database.TimeBetweenEvictionRunsMillis=-1
 Default\ Unmanaged\ JDBC\ Database.JdbcDriver=org.hsqldb.jdbcDriver
 Default\ Unmanaged\ JDBC\ Database.UserName=sa
-Default\ Unmanaged\ JDBC\ Database.Ma&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;Idle=10
+Default\ Unmanaged\ JDBC\ Database.MaxIdle=10
 Default\ Unmanaged\ JDBC\ Database.TestWhileIdle=false
 
 # Resource(id=Default JMS Connection Factory)
 # className: org.apache.activemq.ra.ActiveMQManagedConnectionFactory
 #
-Default\ JMS\ Connection\ Factory.ConnectionInterface=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;.jms.ConnectionFactory, \
-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;.jms.QueueConnectionFactory, 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;.jms.TopicConnectionFactory
+Default\ JMS\ Connection\ Factory.ConnectionInterface=javax.jms.ConnectionFactory, \
+javax.jms.QueueConnectionFactory, javax.jms.TopicConnectionFactory
 Default\ JMS\ Connection\ Factory.ResourceAdapter=Default JMS Resource Adapter
 
 # SecurityService(id=Default Security Service)

Modified: websites/staging/openejb/trunk/content/property-overriding.html
==============================================================================
--- websites/staging/openejb/trunk/content/property-overriding.html (original)
+++ websites/staging/openejb/trunk/content/property-overriding.html Tue Jul 12 18:06:32 2011
@@ -155,19 +155,19 @@
           <p>OpenEJB consists of several components (containers, resource adapters,
 security services, etc.) all of which are pluggable and have their own
 unique set of configurable properties.  These components are required to
-specify their default property values in their service-jar.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml file.  This
+specify their default property values in their service-jar.xml file.  This
 means that at a minimum you as a user only need to specify what you'd like
 to be different.  You specify the property name and the new value and the
 default value will be overwritten before the component is created.</p>
 
 <p>We call this overriding and there are several ways to do it.</p>
 
-<p><a name="PropertyOverriding-Theopenejb.<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="PropertyOverriding-Theopenejb.xml"></a></p>
 
-<h1>The 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</h1>
+<h1>The openejb.xml</h1>
 
-<p>The default 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 has most of the useful properties for each
-component 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 listed with default values for documentation purposes.
+<p>The default openejb.xml file has most of the useful properties for each
+component explicitly listed with default values for documentation purposes.
  It is safe to delete them and be assured that no behavior will change if a
 smaller config file is desired.</p>
 
@@ -175,11 +175,11 @@ smaller config file is desired.</p>
 properties.  See <a href="system-properties.html">System Properties</a>
  for details.</p>
 
-<p><a name="PropertyOverriding-Whatpropertiesareavailable?">&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="PropertyOverriding-Whatpropertiesareavailable?"></a></p>
 
 <h2>What properties are available?</h2>
 
-<p>To know what properties can be overriden the '.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">bin<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb properties'
+<p>To know what properties can be overriden the './bin/openejb properties'
 command is very useful: see <a href="properties-tool.html">Properties Tool</a></p>
 
 <p>It's function is to connect to a running server and print a canonical list
@@ -187,34 +187,34 @@ of all properties OpenEJB can see via th
 When sending requests for help to the users list or jira, it is highly
 encouraged to send the output of this tool with your message.</p>
 
-<p><a name="PropertyOverriding-Notconfigurableviaopenejb.<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="PropertyOverriding-Notconfigurableviaopenejb.xml"></a></p>
 
-<h2>Not configurable via 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>Not configurable via openejb.xml</h2>
 
 <p>The only thing not yet configurable via this file are ServerServices due to
 OpenEJB's embeddable nature and resulting long standing tradition of
 keeping the container system separate from the server layer.  This may
 change someday, but untill then ServerServices are configurable via
-conf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"><service-id>.properties files such as conf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">ejbd.properties to
+conf/<service-id>.properties files such as conf/ejbd.properties to
 configure the main protocol that services EJB client requests.</p>
 
-<p>The format those properties files is greatly adapted from the <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">inet.d style
+<p>The format those properties files is greatly adapted from the xinet.d style
 of configuration and even shares similar functionality and properties such
 as host-based authorization (HBA) via the 'only_from' property.</p>
 
-<p><a name="PropertyOverriding-Restoringopenejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">mltothedefaults">&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="PropertyOverriding-Restoringopenejb.xmltothedefaults"></a></p>
 
-<h2>Restoring 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 to the defaults</h2>
+<h2>Restoring openejb.xml to the defaults</h2>
 
 <p>To restore this file to its original default state, you can simply delete
 it or rename it and OpenEJB will see it's missing and unpack another
-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 into 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"> directory when it starts.</p>
+openejb.xml into the conf/ directory when it starts.</p>
 
 <p>This is not only handy for recovering from a non-functional config, but
-also for upgrading as OpenEJB will not overwrite your e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">isting
+also for upgrading as OpenEJB will not overwrite your existing
 configuration file should you choose to unpack an new distro over the top
 of an old one -- this style of upgrade is safe provided you move your old
-lib<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> directory first.</p>
+lib/ directory first.</p>
 
             </DIV>
           </P>

Modified: websites/staging/openejb/trunk/content/proxies.html
==============================================================================
--- websites/staging/openejb/trunk/content/proxies.html (original)
+++ websites/staging/openejb/trunk/content/proxies.html Tue Jul 12 18:06:32 2011
@@ -152,15 +152,15 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="Pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ies-Where'stheJavasourceforthepro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ies?">&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="Proxies-Where'stheJavasourcefortheproxies?"></a></p>
 
-<h1>Where's the Java source for the pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ies?</h1>
+<h1>Where's the Java source for the proxies?</h1>
 
 <p>The short answer is we do not generate java code containing any ejb logic
 at all as other platforms like WebSphere and WebLogic do.  We use dynamic
-pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">y generation via java.lang.reflect.Pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">y.</p>
+proxy generation via java.lang.reflect.Proxy.</p>
 
-<p>Most of the commercial platforms predate dynamic pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">y generation and not
+<p>Most of the commercial platforms predate dynamic proxy generation and not
 only statically generate java files which are then compiled and included in
 the app but decided as long as they were generating java files that they
 would jam-pack them with as many optimizations as they could.  The result
@@ -168,16 +168,16 @@ was that significant portions of your ap
 attributes and database queries were stuck in generated vendor code.  We
 don't have any equivalent to that.</p>
 
-<p>Dynamic pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ies such as java.lang.reflect.Pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">y or cglib byte code in
+<p>Dynamic proxies such as java.lang.reflect.Proxy or cglib byte code in
 memory, not java source, which is immediately turned into a class
 definition and used.  The basic paradigm is that you give the library the
 interfaces you want implemented and some sort of Handler object.  The
-library will give you back a pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">y instance that does nothing more than
+library will give you back a proxy instance that does nothing more than
 call your handler every time a method is called.  Now it's possible with
 some trickery to pull the byte code for any java.lang.Class instance out of
 the classloader and then use some sort of java decompiler library to turn
 that into some sort of java source file, however there's no real motivation
-to do so as the VM generated pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ies are quite dumb and the code that does
+to do so as the VM generated proxies are quite dumb and the code that does
 all the work is not generated and available for download or svn checkout.</p>
 
 <p>If you are coming from a commercial vendor and simply looking for a good

Modified: websites/staging/openejb/trunk/content/quickstart.html
==============================================================================
--- websites/staging/openejb/trunk/content/quickstart.html (original)
+++ websites/staging/openejb/trunk/content/quickstart.html Tue Jul 12 18:06:32 2011
@@ -152,7 +152,7 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="Quickstart-Installation">&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="Quickstart-Installation"></a></p>
 
 <h1>Installation</h1>
 
@@ -162,19 +162,19 @@ live.</p>
 
 <p>Windows users can download the zip and unpack it with the WinZip program.</p>
 
-<p>Linu<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> users can download the tar.gz and unpack it with the following
+<p>Linux users can download the tar.gz and unpack it with the following
 command:</p>
 
-<p><em>tar <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">zvf openejb-3.0.tar.gz</em></p>
+<p><em>tar xzvf openejb-3.0.tar.gz</em></p>
 
 <p>Congratulations, you've installed OpenEJB.</p>
 
-<p>If you've unpacked OpenEJB into the directory C:\openejb-3.0, 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,
+<p>If you've unpacked OpenEJB into the directory C:\openejb-3.0, for example,
 then this directory is your OPENEJB_HOME directory. The OPENEJB_HOME
 directory is referred to in various parts of the documentation, so it's
 good to remember where it is.</p>
 
-<p><a name="Quickstart-UsingOpenEJB">&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="Quickstart-UsingOpenEJB"></a></p>
 
 <h1>Using OpenEJB</h1>
 
@@ -187,15 +187,15 @@ directory where OpenEJB was unpacked, an
 
 <p><em>C:\openejb-3.0> bin\openejb</em></p>
 
-<p>For UNIX<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Linu<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.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">Mac OS X users, that looks like this:</p>
+<p>For UNIX/Linux/Mac OS X users, that looks like this:</p>
 
 <p>{{<a href="user@host-openejb-3.0.html">user@host openejb-3.0</a></p>
 
-<h1>.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">bin<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb}}</h1>
+<h1>./bin/openejb}}</h1>
 
-<p>You really only need to know two commands to use OpenEJB, [deploy](openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">30:deploy-tool.html)
- and [start|OPENEJB<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">30:Startup]
-. Both are completely documented and have e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples.</p>
+<p>You really only need to know two commands to use OpenEJB, <a href="openejbx30:deploy-tool.html">deploy</a>
+ and [start|OPENEJBx30:Startup]
+. Both are completely documented and have examples.</p>
 
 <p>For help information and command options, try this:</p>
 
@@ -204,18 +204,18 @@ directory where OpenEJB was unpacked, an
   openejb start --help</p>
 </blockquote>
 
-<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">amples on using the start command and options, try this:</p>
+<p>For examples on using the start command and options, try this:</p>
 
 <blockquote>
-  <p>openejb start --e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples</p>
+  <p>openejb start --examples</p>
 </blockquote>
 
 <p>That's it!</p>
 
-<p>If you don't have any EJBs or clients to run, try the ubiquitous [Hello World](openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">30:hello-world.html)
- 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.</p>
+<p>If you don't have any EJBs or clients to run, try the ubiquitous <a href="openejbx30:hello-world.html">Hello World</a>
+ example.</p>
 
-<p><a name="Quickstart-Jointhemailinglist">&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="Quickstart-Jointhemailinglist"></a></p>
 
 <h1>Join the mailing list</h1>
 

Modified: websites/staging/openejb/trunk/content/remote-server.html
==============================================================================
--- websites/staging/openejb/trunk/content/remote-server.html (original)
+++ websites/staging/openejb/trunk/content/remote-server.html Tue Jul 12 18:06:32 2011
@@ -152,9 +152,9 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p>!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">www.openejb.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">images<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">diagram-remote-server.gif|valign=top,
+          <p>!http://www.openejb.org/images/diagram-remote-server.gif|valign=top,
 align=right, hspace=15!
-<a name="RemoteServer-AccessingEJBsRemotely">&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>
+<a name="RemoteServer-AccessingEJBsRemotely"></a></p>
 
 <h1>Accessing EJBs Remotely</h1>
 
@@ -163,7 +163,7 @@ and access EJBs from a remote client.  T
 EJB's Remote Interface is the same, however to actually connect across a
 network to the server, you need to specify different JNDI parameters.</p>
 
-<p><a name="RemoteServer-Shortversion">&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="RemoteServer-Shortversion"></a></p>
 
 <h1>Short version</h1>
 
@@ -171,8 +171,8 @@ network to the server, you need to speci
 forward. You simply need to:
 1. Deploy your bean.
 1. Start the server on the IP and Port you want, 25.14.3.92 and 4201 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.
-1. Use that information in your client to create an initial conte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t
+example.
+1. Use that information in your client to create an initial context
 1. Add the right jars to your client's classpath</p>
 
 <p>So, here it is in short.</p>
@@ -182,7 +182,7 @@ e<IMG class="emoticon" src="https://cwik
 <pre><code>c:\openejb&gt; openejb.bat deploy beans\myBean.jar
 </code></pre>
 
-<p>See the [OPENEJB<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">30:Deploy Tool](openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">30:deploy-tool.html)
+<p>See the <a href="openejbx30:deploy-tool.html">OPENEJBx30:Deploy Tool</a>
  documentation for more details on deploying beans.</p>
 
 <p>Start the server:</p>
@@ -193,24 +193,24 @@ e<IMG class="emoticon" src="https://cwik
 <p>See the Remote Server command-line guide for more details on starting the
 Remote Server.</p>
 
-<p>Create an initial conte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t in your client as such:</p>
+<p>Create an initial context in your client as such:</p>
 
 <pre><code>Properties p = new Properties();
-p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialConte&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("java.naming.provider.url", "ejbd:&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;25.14.3.92:4201");
+p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
+p.put("java.naming.provider.url", "ejbd://25.14.3.92:4201");
 p.put("java.naming.security.principal", "myuser");
 p.put("java.naming.security.credentials", "mypass");
 
-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 ct&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt; = new InitialConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t(p);
+InitialContext ctx = new InitialContext(p);
 </code></pre>
 
-<p>If you don't have any EJBs or clients to run, try the ubiquitous [Hello World](openejb<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">30:hello-world.html)
- 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.</p>
+<p>If you don't have any EJBs or clients to run, try the ubiquitous <a href="openejbx30:hello-world.html">Hello World</a>
+ example.</p>
 
 <p>In OpenEJB 0.9.2 and before, add the following libraries to your clients
 classpath:
-* openejb-<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.jar
-* openejb_client-<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.jar</p>
+* openejb-x.x.x.jar
+* openejb_client-x.x.x.jar</p>
 
 <p>In OpenEJB 1.0 beta 1, add the following libraries to your clients
 classpath: