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:02:32 UTC

svn commit: r792600 [6/49] - /websites/staging/openejb/trunk/content/

Modified: websites/staging/openejb/trunk/content/built-in-type-converters.html
==============================================================================
--- websites/staging/openejb/trunk/content/built-in-type-converters.html (original)
+++ websites/staging/openejb/trunk/content/built-in-type-converters.html Tue Jul 12 18:02:27 2011
@@ -153,8 +153,8 @@
             <!-- $BODY -->
             <DIV id="PageContent">
           <p>The following built-in types are supported for @Resource injection in EJBs
-via <env-entry> elements in a META-INF/ejb-jar.xml or via plain properties
-in a META-INF/env-entries.properties file.</p>
+via <env-entry> elements in a META-INF<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">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 or via plain properties
+in a META-INF<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">env-entries.properties file.</p>
 
 <p>EJB 3.0 required types:</p>
 
@@ -201,16 +201,16 @@ in a META-INF/env-entries.properties fil
 <li>java.util.Vector</li>
 <li>java.util.WeakHashMap</li>
 <li>java.util.logging.Logger</li>
-<li>java.util.regex.Pattern</li>
-<li>javax.management.ObjectName</li>
-<li>javax.naming.Context</li>
+<li>java.util.rege<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.Pattern</li>
+<li>java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.management.ObjectName</li>
+<li>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.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</li>
 <li>org.apache.commons.logging.Log</li>
 <li>org.apache.log4j.Logger</li>
 </ul>
 
-<p>To use an OpenEJB additional type in xml, simply declare it as
-<env-entry-type>java.lang.String</env-entry-type> and it will be converted
-on the fly to the field/setter type used by the bean class.  For example:</p>
+<p>To use an OpenEJB additional type 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, simply declare it as
+<env-entry-type>java.lang.String&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">env-entry-type> and it will be converted
+on the fly to the field<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">setter type used by the bean class.  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>
 
 <pre><code>package org.superbiz.foo;
 
@@ -224,26 +224,26 @@ public class MyBean {
 }
 </code></pre>
 
-<p>Works with an ejb-jar.xml as follows:</p>
+<p>Works with an ejb-jar.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml as follows:</p>
 
-<pre><code>&lt;ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" version="3.0"
+<pre><code>&lt;ejb-jar &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" align="a
 bsmiddle" 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;javaee" version="3.0"
 metadata-complete="false"&gt;
   &lt;enterprise-beans&gt;
     &lt;session&gt;
-      &lt;ejb-name&gt;MyBean&lt;/ejb-name&gt;
+      &lt;ejb-name&gt;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;ejb-name&gt;
       &lt;env-entry&gt;
-  &lt;env-entry-name&gt;org.superbiz.foo.MyBean/myDate&lt;/env-entry-name&gt;
-  &lt;env-entry-value&gt;2008-04-19&lt;/env-entry-value&gt;
-  &lt;env-entry-type&gt;java.lang.String&lt;/env-entry-type&gt;
-      &lt;/env-entry&gt;
-    &lt;/session&gt;
-  &lt;/enterprise-beans&gt;
-&lt;/ejb-jar&gt;
+  &lt;env-entry-name&gt;org.superbiz.foo.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;myDate&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;env-entry-name&gt;
+  &lt;env-entry-value&gt;2008-04-19&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;env-entry-value&gt;
+  &lt;env-entry-type&gt;java.lang.String&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;env-entry-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;env-entry&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;session&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;enterprise-beans&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;ejb-jar&gt;
 </code></pre>
 
 <p>Or with an env-entries.properties file as follows:</p>
 
-<pre><code>org.superbiz.foo.MyBean/myDate = 2008-04-19
+<pre><code>org.superbiz.foo.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;myDate = 2008-04-19
 </code></pre>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/callbacks.html
==============================================================================
--- websites/staging/openejb/trunk/content/callbacks.html (original)
+++ websites/staging/openejb/trunk/content/callbacks.html Tue Jul 12 18:02:27 2011
@@ -155,7 +155,7 @@
           <p>Correct usage of PostConstruct, PreDestroy, PrePassivate, PostActivate, and
 AroundInvoke for EJBs and Interceptors.</p>
 
-<p>For Stateful, Stateless, and MessageDriven, the syntax is as follows:</p>
+<p>For Stateful, Stateless, and MessageDriven, the synta<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> is as follows:</p>
 
 <ul>
 <li>@PostConstruct <any-scope> void <method-name>() </li>
@@ -164,31 +164,31 @@ AroundInvoke for EJBs and Interceptors.<
 <li>@PostActivate <any-scope> void <method-name>() </li>
 </ul>
 
-<p>For an Interceptor, the syntax includes InvocationContext as follows:</p>
+<p>For an Interceptor, the synta<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> includes InvocationConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t as follows:</p>
 
 <ul>
-<li>@PostConstruct <any-scope> void <method-name>(InvocationContext) </li>
-<li>@PreDestroy <any-scope> void <method-name>(InvocationContext) </li>
-<li>@PrePassivate <any-scope> void <method-name>(InvocationContext) </li>
-<li>@PostActivate <any-scope> void <method-name>(InvocationContext) </li>
+<li>@PostConstruct <any-scope> void <method-name>(InvocationConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t) </li>
+<li>@PreDestroy <any-scope> void <method-name>(InvocationConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t) </li>
+<li>@PrePassivate <any-scope> void <method-name>(InvocationConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t) </li>
+<li>@PostActivate <any-scope> void <method-name>(InvocationConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t) </li>
 </ul>
 
-<p>The AroundInvoke syntax for an EJB or Interceptor is the same:</p>
+<p>The AroundInvoke synta<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> for an EJB or Interceptor is the same:</p>
 
 <ul>
-<li>@AroundInvoke <any-scope> Object <method-name>(InvocationContext) throws
-Exception</li>
+<li>@AroundInvoke <any-scope> Object <method-name>(InvocationConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t) throws
+E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception</li>
 </ul>
 
-<p><a name="Callbacks-Stateless"></a></p>
+<p><a name="Callbacks-Stateless">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
 
 <h2>Stateless</h2>
 
-<pre><code>import javax.ejb.Stateless;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+<pre><code>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;.annotation.PostConstruct;
+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;.annotation.PreDestroy;
+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;.interceptor.AroundInvoke;
+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;.interceptor.InvocationConte&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;
 
 @Stateless
 public class MyStatelessBean implements  MyBusinessInterface  {
@@ -204,23 +204,23 @@ public class MyStatelessBean implements 
     }
 
     @AroundInvoke
-    public Object invoke(InvocationContext invocationContext) throws Exception {
-    return invocationContext.proceed();
+    public Object invoke(InvocationConte&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 invocationConte&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) 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 {
+    return invocationConte&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.proceed();
     }
 }
 </code></pre>
 
-<p><a name="Callbacks-Stateful"></a></p>
+<p><a name="Callbacks-Stateful">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
 
 <h2>Stateful</h2>
 
-<pre><code>import javax.ejb.Stateful;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+<pre><code>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.Stateful;
+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.PostActivate;
+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.PrePassivate;
+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;.annotation.PostConstruct;
+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;.annotation.PreDestroy;
+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;.interceptor.AroundInvoke;
+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;.interceptor.InvocationConte&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;
 
 @Stateful
 public class MyStatefulBean implements  MyBusinessInterface  {
@@ -236,8 +236,8 @@ public class MyStatefulBean implements  
     }
 
     @AroundInvoke
-    public Object invoke(InvocationContext invocationContext) throws Exception {
-          return invocationContext.proceed();
+    public Object invoke(InvocationConte&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 invocationConte&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) 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 {
+          return invocationConte&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.proceed();
     }
 
     @PostActivate
@@ -252,15 +252,15 @@ public class MyStatefulBean implements  
 }
 </code></pre>
 
-<p><a name="Callbacks-MessageDriven"></a></p>
+<p><a name="Callbacks-MessageDriven">&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>
 
 <h2>MessageDriven</h2>
 
-<pre><code>import javax.ejb.MessageDriven;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+<pre><code>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.MessageDriven;
+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;.annotation.PostConstruct;
+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;.annotation.PreDestroy;
+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;.interceptor.AroundInvoke;
+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;.interceptor.InvocationConte&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;
 
 @MessageDriven
 public class MyMessageDrivenBean implements  MyListenerInterface  {
@@ -276,47 +276,47 @@ public class MyMessageDrivenBean impleme
     }
 
     @AroundInvoke
-    public Object invoke(InvocationContext invocationContext) throws Exception {
-          return invocationContext.proceed();
+    public Object invoke(InvocationConte&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 invocationConte&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) 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 {
+          return invocationConte&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.proceed();
     }
 }
 </code></pre>
 
-<p><a name="Callbacks-Interceptor"></a></p>
+<p><a name="Callbacks-Interceptor">&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>
 
 <h2>Interceptor</h2>
 
-<pre><code>import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
+<pre><code>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;.annotation.PostConstruct;
+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;.annotation.PreDestroy;
+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;.interceptor.InvocationConte&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;.interceptor.AroundInvoke;
+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.PostActivate;
+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.PrePassivate;
 
 public class MyInterceptor {
 
     @PostConstruct
-    public void constructed(InvocationContext invocationContext){
+    public void constructed(InvocationConte&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 invocationConte&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){
 
     }
 
     @PreDestroy
-    public void destroy(InvocationContext invocationContext){
+    public void destroy(InvocationConte&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 invocationConte&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){
 
     }
 
     @AroundInvoke
-    public Object invoke(InvocationContext invocationContext) throws Exception {
-        return invocationContext.proceed();
+    public Object invoke(InvocationConte&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 invocationConte&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) 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 {
+        return invocationConte&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.proceed();
     }
 
     @PostActivate
-    public void activated(InvocationContext invocationContext){
+    public void activated(InvocationConte&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 invocationConte&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){
 
     }
 
     @PrePassivate
-    public void passivate(InvocationContext invocationContext){
+    public void passivate(InvocationConte&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 invocationConte&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){
 
     }
 }

Modified: websites/staging/openejb/trunk/content/client-server-transports.html
==============================================================================
--- websites/staging/openejb/trunk/content/client-server-transports.html (original)
+++ websites/staging/openejb/trunk/content/client-server-transports.html Tue Jul 12 18:02:27 2011
@@ -152,24 +152,24 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="Client-ServerTransports-Client/Servertransports"></a></p>
+          <p><a name="Client-ServerTransports-Client<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Servertransports">&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>
 
-<h1>Client/Server transports</h1>
+<h1>Client<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Server transports</h1>
 
-<table>
-<tr><th> jar </th><th> transport description </th></tr>
-<tr><td> openejb-ejbd-3.0.jar </td><td> provides the 'ejbd' protocol.   A binary protocol
-traveling over a socket </td></tr>
-<tr><td> openejb-http-3.0.jar </td><td> supports the ejbd protocol over http </td></tr>
-<tr><td> openejb-derbynet-3.0.jar </td><td> allows for derby to accessed via it's network
-driver </td></tr>
-<tr><td> openejb-hsql-3.0.jar </td><td> allows for hsqldb to be accessed via it's network
-driver </td></tr>
-<tr><td> openejb-cxf-3.0.jar </td><td> turns on webservice ability, soap/http, via cxf </td></tr>
-<tr><td> openejb-activemq-3.0.jar </td><td> supports remote jms clients via activemq </td></tr>
-<tr><td> openejb-telnet-3.0.jar </td><td> allows for connecting to the server   via telnet
-for monitoring </td></tr>
-</table>
+<p><table>
+<tr><th> 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">th><th> transport description &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">th>&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tr>
+<tr><td> openejb-ejbd-3.0.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">td><td> provides the 'ejbd' protocol.    A binary protocol
+traveling over a socket &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td>&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tr>
+<tr><td> openejb-http-3.0.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">td><td> supports the ejbd protocol over 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">td>&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tr>
+<tr><td> openejb-derbynet-3.0.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">td><td> allows for derby to accessed via it's network
+driver &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td>&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tr>
+<tr><td> openejb-hsql-3.0.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">td><td> allows for hsqldb to be accessed via it's network
+driver &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td>&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tr>
+<tr><td> openejb-c<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">f-3.0.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">td><td> turns on webservice ability, soap<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">http, via c<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">f &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td>&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" wid
 th="16" align="absmiddle" alt="" border="0">tr>
+<tr><td> openejb-activemq-3.0.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">td><td> supports remote jms clients via activemq &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td>&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tr>
+<tr><td> openejb-telnet-3.0.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">td><td> allows for connecting to the server    via telnet
+for monitoring &lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">td>&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">tr>
+&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">table></p>
 
             </DIV>
           </P>

Modified: websites/staging/openejb/trunk/content/clients.html
==============================================================================
--- websites/staging/openejb/trunk/content/clients.html (original)
+++ websites/staging/openejb/trunk/content/clients.html Tue Jul 12 18:02:27 2011
@@ -152,25 +152,25 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="Clients-LocalClient(embeddedcontainer)"></a></p>
+          <p><a name="Clients-LocalClient(embeddedcontainer)">&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>
 
 <h1>Local Client (embedded container)</h1>
 
 <pre><code>Properties p = new Properties();
-p.put("java.naming.factory.initial", "org.apache.openejb.client.LocalInitialContextFactory");
+p.put("java.naming.factory.initial", "org.apache.openejb.client.LocalInitialConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;tFactory");
 
-InitialContext ctx = new InitialContext(p);
+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);
 
-MyBean myBean = (MyBean) ctx.lookup("MyBeanRemote");
+MyBean myBean = (MyBean) 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;.lookup("MyBeanRemote");
 </code></pre>
 
-<p><a name="Clients-LocalClient(non-defaultrealmname)"></a></p>
+<p><a name="Clients-LocalClient(non-defaultrealmname)">&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>
 
 <h1>Local Client (non-default realm name)</h1>
 
-<p><a name="Clients-Loginconfigurationfile(conf/login.config)"></a></p>
+<p><a name="Clients-Loginconfigurationfile(conf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">login.config)">&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>
 
-<h2>Login configuration file (conf/login.config)</h2>
+<h2>Login configuration file (conf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">login.config)</h2>
 
 <pre><code>PropertiesLogin {
     org.apache.openejb.core.security.jaas.PropertiesLoginModule required
@@ -186,65 +186,65 @@ MyApp {
 };
 </code></pre>
 
-<p><a name="Clients-Programcode"></a></p>
+<p><a name="Clients-Programcode">&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>
 
 <h2>Program code</h2>
 
 <pre><code>Properties p = new Properties();
-p.put("java.naming.factory.initial", "org.apache.openejb.client.LocalInitialContextFactory");
+p.put("java.naming.factory.initial", "org.apache.openejb.client.LocalInitialConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;tFactory");
 p.put("openejb.authentication.realmName", "MyApp");
 
-InitialContext ctx = new InitialContext(p);
+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);
 
-MyBean myBean = (MyBean) ctx.lookup("MyBeanRemote");
+MyBean myBean = (MyBean) 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;.lookup("MyBeanRemote");
 </code></pre>
 
-<p><a name="Clients-RemoteClient(openejbstandalone)"></a></p>
+<p><a name="Clients-RemoteClient(openejbstandalone)">&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>
 
 <h1>Remote Client (openejb standalone)</h1>
 
 <pre><code>Properties p = new Properties();
-p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-p.put("java.naming.provider.url", "ejbd://localhost:4201");
-// user and pass optional
+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;localhost:4201");
+&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; user and pass optional
 p.put("java.naming.security.principal", "myuser");
 p.put("java.naming.security.credentials", "mypass");
 
-InitialContext ctx = new InitialContext(p);
+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);
 
-MyBean myBean = (MyBean) ctx.lookup("MyBeanRemote");
+MyBean myBean = (MyBean) 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;.lookup("MyBeanRemote");
 </code></pre>
 
-<p><a name="Clients-RemoteClientwithHTTP(openejbstandalone)"></a></p>
+<p><a name="Clients-RemoteClientwithHTTP(openejbstandalone)">&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>
 
 <h1>Remote Client with HTTP (openejb standalone)</h1>
 
 <pre><code>Properties p = new Properties();
-p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-p.put("java.naming.provider.url", "http://localhost:4204/ejb");
-// user and pass optional
+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", "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;localhost:4204&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;ejb");
+&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&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; user and pass optional
 p.put("java.naming.security.principal", "myuser");
 p.put("java.naming.security.credentials", "mypass");
 
-InitialContext ctx = new InitialContext(p);
+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);
 
-MyBean myBean = (MyBean) ctx.lookup("MyBeanRemote");
+MyBean myBean = (MyBean) 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;.lookup("MyBeanRemote");
 </code></pre>
 
-<p><a name="Clients-RemoteClientwithHTTP(intomcat)"></a></p>
+<p><a name="Clients-RemoteClientwithHTTP(intomcat)">&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>
 
 <h1>Remote Client with HTTP (in tomcat)</h1>
 
 <pre><code>Properties p = new Properties();
-p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-p.put("java.naming.provider.url", "http://127.0.0.1:8080/openejb/ejb");
-// user and pass optional
+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", "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;127.0.0.1:8080&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;ejb");
+&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&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; user and pass optional
 p.put("java.naming.security.principal", "myuser");
 p.put("java.naming.security.credentials", "mypass");
 
-InitialContext ctx = new InitialContext(p);
+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);
 
-MyBean myBean = (MyBean) ctx.lookup("MyBeanRemote");
+MyBean myBean = (MyBean) 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;.lookup("MyBeanRemote");
 </code></pre>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/collapsed-ear.html
==============================================================================
--- websites/staging/openejb/trunk/content/collapsed-ear.html (original)
+++ websites/staging/openejb/trunk/content/collapsed-ear.html Tue Jul 12 18:02:27 2011
@@ -152,7 +152,7 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="CollapsedEAR-Onearchive"></a></p>
+          <p><a name="CollapsedEAR-Onearchive">&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>
 
 <h1>One archive</h1>
 
@@ -161,10 +161,10 @@ in your WAR file as one app.
 * No classloader boundries between Servlets and EJBs
 * EJBs and Servlets can share all third-party libraries (like Spring!) -
 no EAR required.
-* Can put the web.xml and ejb-jar.xml in the same archive (the WAR file).
+* Can put the web.<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 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 in the same archive (the WAR file).
 * EJBs can see Servlet classes and vice versa.</p>
 
-<p><a name="CollapsedEAR-NotquiteJ2EE(itistrulyJEE6)"></a></p>
+<p><a name="CollapsedEAR-NotquiteJ2EE(itistrulyJEE6)">&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>
 
 <h1>Not quite J2EE (it is truly JEE6)</h1>
 
@@ -193,13 +193,13 @@ formatted 'Class-Path' entry in the EAR'
 is where J2EE "jumps the shark" for a large majority of people's needs.</p></li>
 </ul>
 
-<p><a name="CollapsedEAR-ExamplewithTomcat"></a></p>
+<p><a name="CollapsedEAR-E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amplewithTomcat">&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>
 
-<h1>Example with Tomcat</h1>
+<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 with Tomcat</h1>
 
-<p>If you want to try to work with Servlets/JSP and OpenEJB using Tomcat, see
-the <a href="openejbx30:tomcat.html">setup page</a>
- and the "/webapps/ejb-examples" section of the [openejb-examples.zip|Download]
+<p>If you want to try to work with Servlets<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">JSP and OpenEJB using Tomcat, see
+the [setup page](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:tomcat.html)
+ and the "<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">webapps<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">ejb-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" section of the [openejb-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.zip|Download]
  available on the download page.</p>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/common-datasource-configurations.html
==============================================================================
--- websites/staging/openejb/trunk/content/common-datasource-configurations.html (original)
+++ websites/staging/openejb/trunk/content/common-datasource-configurations.html Tue Jul 12 18:02:27 2011
@@ -152,11 +152,11 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="CommonDataSourceConfigurations-CommonVendors"></a></p>
+          <p><a name="CommonDataSourceConfigurations-CommonVendors">&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>
 
 <h1>Common Vendors</h1>
 
-<p><a name="CommonDataSourceConfigurations-HSQLDB"></a></p>
+<p><a name="CommonDataSourceConfigurations-HSQLDB">&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>
 
 <h2>HSQLDB</h2>
 
@@ -168,88 +168,88 @@ database.</p>
     JdbcUrl jdbc:hsqldb:file:hsqldb
     UserName sa
     Password
-&lt;/Resource&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;
 </code></pre>
 
-<p><a name="CommonDataSourceConfigurations-Derby(Embedded)"></a></p>
+<p><a name="CommonDataSourceConfigurations-Derby(Embedded)">&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>
 
 <h2>Derby (Embedded)</h2>
 
 <pre><code>&lt;Resource id="Derby Database" type="DataSource"&gt;
-    #Embedded Derby example
+    #Embedded Derby 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;ample
 
     JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
     JdbcUrl jdbc:derby:derbyDB;create=true
     UserName admin
     Password pass
-&lt;/Resource&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;
 </code></pre>
 
-<p><a name="CommonDataSourceConfigurations-MySQL"></a></p>
+<p><a name="CommonDataSourceConfigurations-MySQL">&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>
 
 <h2>MySQL</h2>
 
 <pre><code>&lt;Resource id="MySQL Database" type="DataSource"&gt;
-    #  MySQL example
+    #  MySQL 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;ample
     #
     #  This connector will not work until you download the driver at:
-    #  http://www.mysql.com/downloads/api-jdbc-stable.html
+    #  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;www.mysql.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;downloads&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;api-jdbc-stable.html
 
     JdbcDriver  com.mysql.jdbc.Driver
-    JdbcUrl jdbc:mysql://localhost/test
+    JdbcUrl jdbc:mysql:&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;test
     UserName    test
-&lt;/Resource&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;
 </code></pre>
 
-<p><a name="CommonDataSourceConfigurations-Oracle"></a></p>
+<p><a name="CommonDataSourceConfigurations-Oracle">&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>
 
 <h2>Oracle</h2>
 
 <pre><code>&lt;Resource id="Oracle Database" type="DataSource"&gt;
-    #  Oracle example
+    #  Oracle 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;ample
     #
     #  This connector will not work until you download the driver at:
-    #  http://otn.oracle.com/software/tech/java/sqlj_jdbc/content.html
+    #  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;otn.oracle.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;software&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;tech&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&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmidd
 le" alt="" border="0"&gt;sqlj_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;content.html
     JdbcDriver  oracle.jdbc.OracleDriver
     JdbcUrl jdbc:oracle:thin:@localhost:1521:orcl
     UserName    scott
     Password    tiger
-&lt;/Resource&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;
 </code></pre>
 
-<p><a name="CommonDataSourceConfigurations-PosgreSQL"></a></p>
+<p><a name="CommonDataSourceConfigurations-PosgreSQL">&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>
 
 <h2>PosgreSQL</h2>
 
 <pre><code>&lt;Resource id="PostgreSQL Database" type="DataSource"&gt;
-    #  PostgreSQL example
+    #  PostgreSQL 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;ample
     #
     #  This connector will not work until you download the driver at:
-    #  http://jdbc.postgresql.org/download.html
+    #  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;jdbc.postgresql.org&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;download.html
     JdbcDriver   org.postgresql.Driver
-    JdbcUrl  jdbc:postgresql://localhost/test
+    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;test
     UserName     postgres
     Password     pass
-&lt;/Resource&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;
 </code></pre>
 
-<p><a name="CommonDataSourceConfigurations-InstantDB"></a></p>
+<p><a name="CommonDataSourceConfigurations-InstantDB">&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>
 
 <h2>InstantDB</h2>
 
 <pre><code>&lt;Resource id="InstantDB Database" type="DataSource"&gt;
-    #  InstantDB example
+    #  InstantDB 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;ample
     #
     JdbcDriver   org.enhydra.instantdb.jdbc.idbDriver
-    JdbcUrl  jdbc:idb:conf/instantdb.properties
+    JdbcUrl  jdbc:idb: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;instantdb.properties
     UserName     Admin
     Password     pass
-&lt;/Resource&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;
 </code></pre>
 
 <p>{info:title=Information}
 Internally, OpenEJB relies on Apache Commons DBCP to manage DataSources. To
-get the full list of available configuration properties, have a look to [Apache Commons DBCP configuration](http://commons.apache.org/dbcp/configuration.html|Apache Commons DBCP configuration)
+get the full list of available configuration properties, have a look to [Apache Commons DBCP configuration](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">commons.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">dbcp<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">configuration.html|Apache Commons DBCP configuration)
 .
 {info} </p>
 

Modified: websites/staging/openejb/trunk/content/common-errors.html
==============================================================================
--- websites/staging/openejb/trunk/content/common-errors.html (original)
+++ websites/staging/openejb/trunk/content/common-errors.html Tue Jul 12 18:02:27 2011
@@ -152,7 +152,7 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="CommonErrors-Cannotfindcontainer"FOO"forbean"BAR""></a></p>
+          <p><a name="CommonErrors-Cannotfindcontainer"FOO"forbean"BAR"">&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>
 
 <h1>Cannot find container "FOO" for bean "BAR"</h1>
 
@@ -164,7 +164,7 @@ with. Here, the bean BAR wants to go int
 currently configured.</p>
 
 <p>This message is displayed when the server is starting up.
-<a name="CommonErrors-Cannotfindbean"FOO"referencedbybean"BAR"."></a></p>
+<a name="CommonErrors-Cannotfindbean"FOO"referencedbybean"BAR".">&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>
 
 <h1>Cannot find bean "FOO" referenced by bean "BAR".</h1>
 

Modified: websites/staging/openejb/trunk/content/common-persistenceprovider-properties.html
==============================================================================
--- websites/staging/openejb/trunk/content/common-persistenceprovider-properties.html (original)
+++ websites/staging/openejb/trunk/content/common-persistenceprovider-properties.html Tue Jul 12 18:02:27 2011
@@ -155,45 +155,45 @@
           <p>While not a definitive list, it does help to show a side-by-side view of
 common properties used by the various persistence providers out there.</p>
 
-<p><a name="CommonPersistenceProviderproperties-TopLink"></a></p>
+<p><a name="CommonPersistenceProviderproperties-TopLink">&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>
 
 <h1>TopLink</h1>
 
 <pre><code>&lt;properties&gt;
 
-  &lt;!--http://www.oracle.com/technology/products/ias/toplink/JPA/essentials/toplink-jpa-extensions.html--&gt;
-  &lt;property name="toplink.ddl-generation" value="drop-and-create-tables"/&gt;
-  &lt;property name="toplink.logging.level" value="FINEST"/&gt;
-  &lt;property name="toplink.ddl-generation.output-mode" value="both"/&gt;
-  &lt;property name="toplink.target-server" value="pl.zsk.samples.ejbservice.OpenEJBServerPlatform"/&gt;
-&lt;/properties&gt;
+  &lt;!--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;www.oracle.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;technology&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;products&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;ias&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;toplink&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;JPA&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;essentials&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;toplink-jpa-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;tensions.html--&gt;
+  &lt;property name="toplink.ddl-generation" value="drop-and-create-tables"&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;property name="toplink.logging.level" value="FINEST"&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;property name="toplink.ddl-generation.output-mode" value="both"&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;property name="toplink.target-server" value="pl.zsk.samples.ejbservice.OpenEJBServerPlatform"&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;
 </code></pre>
 
-<p><a name="CommonPersistenceProviderproperties-OpenJPA"></a></p>
+<p><a name="CommonPersistenceProviderproperties-OpenJPA">&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>
 
 <h1>OpenJPA</h1>
 
 <pre><code>&lt;properties&gt;
-  &lt;!--http://openjpa.apache.org/faq.html--&gt;
+  &lt;!--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;openjpa.apache.org&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;faq.html--&gt;
   &lt;!-- does not create foreign keys, creates schema and deletes content of a database
        (deleteTableContents - foreign keys are created twice???), use dropDB instead --&gt;
-  &lt;property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(foreignKeys=true,schemaAction='dropDB,add')"/&gt;
+  &lt;property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(foreignKeys=true,schemaAction='dropDB,add')"&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;!--Resolves the problem with foreign key integrity - joined entities are persisted sometimes in wrong order??? (verify it)--&gt;
-  &lt;property name="openjpa.jdbc.SchemaFactory" value="native(foreignKeys=true)" /&gt;
-  &lt;!--Create foreign keys--&gt; &lt;property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict"/&gt;
-  &lt;property name="openjpa.Log" value="DefaultLevel=TRACE,SQL=TRACE" /&gt;
-&lt;/properties&gt;
+  &lt;property name="openjpa.jdbc.SchemaFactory" value="native(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;!--Create foreign keys--&gt; &lt;property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict"&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;property name="openjpa.Log" value="DefaultLevel=TRACE,SQL=TRACE" &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;
 </code></pre>
 
-<p><a name="CommonPersistenceProviderproperties-Hibernate"></a></p>
+<p><a name="CommonPersistenceProviderproperties-Hibernate">&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>
 
 <h1>Hibernate</h1>
 
 <pre><code>&lt;properties&gt;
-  &lt;property name="hibernate.hbm2ddl.auto" value="create-drop"/&gt;
+  &lt;property name="hibernate.hbm2ddl.auto" value="create-drop"&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;property name="hibernate.transaction.manager_lookup_class"
-     value="org.apache.openejb.hibernate.TransactionManagerLookup"/&gt;
-&lt;/properties&gt;
+     value="org.apache.openejb.hibernate.TransactionManagerLookup"&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;
 </code></pre>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/concepts.html
==============================================================================
--- websites/staging/openejb/trunk/content/concepts.html (original)
+++ websites/staging/openejb/trunk/content/concepts.html Tue Jul 12 18:02:27 2011
@@ -156,9 +156,9 @@
 environments whom would likely already have three things:</p>
 
 <ul>
-<li>their one "server" platform with existing clients and protocols</li>
+<li>their one "server" platform with 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 clients and protocols</li>
 <li>their own way to configure their platform</li>
-<li>existing services like TransactionManager, Security, and Connector</li>
+<li>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 services like TransactionManager, Security, and Connector</li>
 </ul>
 
 <p>Thus the focus of OpenEJB was to create an EJB implementation that would be
@@ -180,7 +180,7 @@ particular Server, which has the job of 
 providing a way for it's clients to reference and invoke components (beans)
 hosted in Containers.  Because Containers have no dependence at all only
 Server, you can run OpenEJB without any Server at all in an embedded
-environment for example without any work or any extra overhead.  Similarly
+environment 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 without any work or any e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">tra overhead.  Similarly
 you can add as many new Server components as you want without ever having
 to modify any Containers.</p>
 
@@ -190,26 +190,26 @@ all Containers are pluggable, isolated f
 Container is bound to another Container and therefore removing or adding a
 Container has no repercussions on the other Containers in the system. 
 TransactionManager, SecurityService and Connector also pluggable and are
-services exposed to Containers.  A Container may not be dependent on
+services e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">posed to Containers.  A Container may not be dependent on
 specific implementations of those services.  Service Providers define what
 services they are offering (Container, Connector, Security, Transaction,
-etc.) in a file they place in their jar called service-jar.xml.  </p>
+etc.) in a file they place in their jar called 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.  </p>
 
-<p>The service-jar.xml should be placed not in the META-INF but somewhere in
-your package hierarchy (ours is in /org/apache/openejb/service-jar.xml)
-which allows the services in your service-jar.xml to be referenced by name
+<p>The 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 should be placed not in the META-INF but somewhere in
+your package hierarchy (ours is in <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">apache<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">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)
+which allows the services in your 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 to be referenced by name
 (such as DefaultStatefulContainer) or more specifically by package and id
 (such as org.apache.openejb#DefaultStatefulContainer).  </p>
 
 <p>The same implementation of a service can be declared several times in a
-service-jar.xml with different ids.  This allows for you to setup several
+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 with different ids.  This allows for you to setup several
 several different profiles or pre-configured versions of the services you
 provide each with a different name and different set of default values for
 its properties.  </p>
 
 <p>In your openejb.conf file when you declare Containers and Connectors, we
 are actually hooking you up with Service Providers automatically.  You get
-what is in the org/apache/openejb/service-jar.xml by default, but you are
+what is in the org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">apache<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">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 by default, but you are
 able to point specifically to a specific Service Provider by the 'provider'
 attribute on the Container, Connector, TransactionManager, SecurityService,
 etc. elements of the openejb.conf file.  When you declare a service
@@ -220,7 +220,7 @@ openejb.conf file as large or as small a
 doing this can be thought of as essentially instantiating the Service
 Provider and configuring that instance for inclusion in the runtime system. </p>
 
-<p>For example Container(id=NoTimeoutStatefulContainer,
+<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 Container(id=NoTimeoutStatefulContainer,
 provider=DefaultStatefulContainer) could be declared with it's Timeout
 property set to 0 for never, and a
 Container(id=ShortTimeoutStatefulContainer,

Modified: websites/staging/openejb/trunk/content/configuration-and-assembly.html
==============================================================================
--- websites/staging/openejb/trunk/content/configuration-and-assembly.html (original)
+++ websites/staging/openejb/trunk/content/configuration-and-assembly.html Tue Jul 12 18:02:27 2011
@@ -159,7 +159,7 @@ we reserve the right to change it at any
 public API.
 {note}</p>
 
-<p><a name="ConfigurationandAssembly-OverviewinCode"></a></p>
+<p><a name="ConfigurationandAssembly-OverviewinCode">&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>
 
 <h1>Overview in Code</h1>
 
@@ -168,43 +168,43 @@ OpenEJB using it's internal API.  This i
 see people constructing Jetty in code.  All our internal tests look like
 this.</p>
 
-<p>This usage involves no xml parsing or classpath scanning.  If you don't
+<p>This usage involves no <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml parsing or classpath scanning.  If you don't
 give it to OpenEJB, OpenEJB doesn't know about it.  This is OpenEJB with
 all the magic stripped away.  At a high level:</p>
 
 <p># You build your app in code using the JAXB tree in code and hand it to the {{ConfigurationFactory}}.
-  ## The {{org.apache.openejb.jee}} package contains JAXB trees for ejb-jar.xml, beans.xml and all the Java EE deployment descriptors.
+  ## The {{org.apache.openejb.jee}} package contains JAXB trees for 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, beans.<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 the Java EE deployment descriptors.
   # The {{ConfigurationFactory}} will produce a fully canonical version of the app called the {{Info}} tree by:
-  ## Merging all sources of meta-data -- xml and annotations
+  ## Merging all sources of meta-data -- <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 annotations
   ## Resolving all ejb, persistence unit, datasource and other references
   ## Validating the app and looking for mistakes
   # The {{Info}} tree is
   ## The singular source of information about the application from this point forward.
   ## Pure data with no smarts or logic of any kind.
   ## The instruction set of what would be built by the assembler.
-  # The {{Assembler}} will build and start the application exactly as described in the {{Info}} tree.
+  # The {{Assembler}} will build and start the application 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 as described in the {{Info}} tree.
   ## When this step completes, you have a running application.
   ## Any failures prior to this point require no cleanup.  Only the assembler builds "live" objects.</p>
 
-<pre><code>import javax.ejb.LocalBean;
-import javax.ejb.Stateful;
-import javax.naming.InitialContext;
+<pre><code>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.LocalBean;
+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.Stateful;
+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 junit.framework.TestCase;
 import org.apache.openejb.assembler.classic.Assembler;
 import org.apache.openejb.assembler.classic.SecurityServiceInfo;
 import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.client.LocalInitialContextFactory;
+import 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;
 import org.apache.openejb.config.ConfigurationFactory;
 import org.apache.openejb.jee.EjbJar;
 import org.apache.openejb.jee.StatefulBean;
 
-public class StatefulTest extends TestCase {
+public class StatefulTest 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;tends TestCase {
 
     @Override
-    protected void setUp() throws Exception {
+    protected void setUp() 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 {
 
-        System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
+        System.setProperty(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.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, 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.class.getName());
 
         ConfigurationFactory config = new ConfigurationFactory();
         Assembler assembler = new Assembler();
@@ -218,9 +218,9 @@ public class StatefulTest extends TestCa
         assembler.createApplication(config.configureApplication(ejbJar));
     }
 
-    public void test() throws Exception {
-        InitialContext context = new InitialContext();
-        MyBean myBean = (MyBean) context.lookup("MyBeanLocalBean");
+    public void test() 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();
+        MyBean myBean = (MyBean) 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("MyBeanLocalBean");
 
         assertEquals("pan", myBean.echo("nap"));
     }
@@ -237,7 +237,7 @@ public class StatefulTest extends TestCa
 }
 </code></pre>
 
-<p><a name="ConfigurationandAssembly-LogicalOverview"></a></p>
+<p><a name="ConfigurationandAssembly-LogicalOverview">&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>
 
 <h1>Logical Overview</h1>
 
@@ -276,7 +276,7 @@ is broken into two phases:</p>
 <p>The listings above aren't necesarrily complete or perfectly ordered, but
 generally show the nature of the work done in each phase.  </p>
 
-<p><a name="ConfigurationandAssembly-ConfigurationPhase"></a></p>
+<p><a name="ConfigurationandAssembly-ConfigurationPhase">&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>
 
 <h2>Configuration Phase</h2>
 
@@ -289,7 +289,7 @@ Everything in the configuration phase is
 configuration phase we just issue an error and say "App will not be loaded"
 and that's it, there's nothing to undo.  </p>
 
-<p><a name="ConfigurationandAssembly-InfoObjects-DatabetweenConfigurationandAssembly"></a></p>
+<p><a name="ConfigurationandAssembly-InfoObjects-DatabetweenConfigurationandAssembly">&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>
 
 <h2>Info Objects - Data between Configuration and Assembly</h2>
 
@@ -309,17 +309,17 @@ tree and an interface that produces it:<
 
 <p>The job of the OpenEjbConfigurationFactory is simply to produce an 
 OpenEjbConfiguration tree.  With this simple decoupling when the time comes
-we can actually support much different styles of use/topologies.  For
-example, a cluster scenario.  We could create an
+we can actually support much different styles of use<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">topologies.  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, a cluster scenario.  We could create an
 OpenEjbConfigurationFactory implementation that actually pulled the
 OpenEjbConfiguration from a central store or some sort of configuration
 server of our creation.  Perhaps, someday we write an
-OpenEjbConfigurationFactory implementation to wrap the existing one and
+OpenEjbConfigurationFactory implementation to wrap 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">isting one and
 look for any changed files.  If nothing has changed since last boot, we
 simple deserialize an OpenEjbConfiguration tree saved from a previous boot
 as a way of reducing startup time on very large apps.</p>
 
-<p><a name="ConfigurationandAssembly-Assembly"></a></p>
+<p><a name="ConfigurationandAssembly-Assembly">&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>
 
 <h2>Assembly</h2>
 
@@ -327,7 +327,7 @@ as a way of reducing startup time on ver
 process is inherently ingrained in the details on how OpenEJB works
 internally.  Keeping it separated from descriptor parsing, validation,
 resolving, etc. keeps the actual "openejb building" code as simple as
-possible.  It also allows for some flexibility and change to take place
+possible.  It also allows for some fle<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ibility and change to take place
 architecturally with less chance of it rippling through the entire system. 
 However it's also not so generic (like spring, etc.) that becomes very
 difficult to get things built in a certain way or in a certain order
@@ -336,11 +336,11 @@ as beautiful as possible.  It knows all 
 individual part and in what order to build them. </p>
 
 <p>In OpenEJB, the Assembler is not supposed to be the gem of the project that
-we keep clean, motivating us to push complex things out into other areas
+we keep clean, motivating us to push comple<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> things out into other areas
 for other people (usually users) to worry about.  In fact, it's the
 opposite.  The runtime system gets top priority on it's architectural needs
 and the assembler gets last priority.  If there's something we can do in
-the Assembler that saves the rest of the system from complexity, we gladly
+the Assembler that saves the rest of the system from comple<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ity, we gladly
 throw the Assembler on that grenade.  Our philosophy is that you can't make
 100% of your system "perfect" all the time and sometime the mess has to go
 somewhere.  The assembler is where.  It's purposely not over architected so