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

Modified: websites/staging/openejb/trunk/content/multiple-business-interface-hazzards.html
==============================================================================
--- websites/staging/openejb/trunk/content/multiple-business-interface-hazzards.html (original)
+++ websites/staging/openejb/trunk/content/multiple-business-interface-hazzards.html Tue Jul 12 18:06:32 2011
@@ -152,27 +152,27 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="MultipleBusinessInterfaceHazzards-UndeclaredThrowableE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception">&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="MultipleBusinessInterfaceHazzards-UndeclaredThrowableException"></a></p>
 
-<h1>UndeclaredThrowableE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception</h1>
+<h1>UndeclaredThrowableException</h1>
 
-<p>When two java interfaces are implemented by 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 and those two
+<p>When two java interfaces are implemented by a proxy and those two
 interfaces declare the <em>same method</em> but with <em>different throws clauses</em>
 some very nasty side effects happen, namely you loose the ability to throw
-any checked 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 that are not in the throws clause of both methods.</p>
+any checked exceptions that are not in the throws clause of both methods.</p>
 
 <pre><code>import junit.framework.TestCase;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
-import java.lang.reflect.UndeclaredThrowableE&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;
+import java.lang.reflect.UndeclaredThrowableException;
 
-&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;**
+/**
  * @version $Rev$ $Date$
- *&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;
-public class 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;ceptionTest 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 {
+ */
+public class ExceptionTest extends TestCase {
 
-    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 {
+    public void test() throws Exception {
     ClassLoader classLoader = this.getClass().getClassLoader();
         Class[]
 </code></pre>
@@ -181,18 +181,18 @@ public class E&lt;IMG class="emoticon" s
 
 <pre><code>    InvocationHandler h = new TestInvocationHandler();
 
-    Object pro&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;y =
+    Object proxy =
 </code></pre>
 
-<p>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.newPro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yInstance(classLoader, interfaces, h);</p>
+<p>java.lang.reflect.Proxy.newProxyInstance(classLoader, interfaces, h);</p>
 
-<pre><code>    One one = (One) pro&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;y;
+<pre><code>    One one = (One) proxy;
 
     try {
-        one.run(new CommonE&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());
-    } catch (CommonE&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 e) {
-        &lt;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; this will work
-    } catch(UndeclaredThrowableE&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 u) {
+        one.run(new CommonException());
+    } catch (CommonException e) {
+        // this will work
+    } catch(UndeclaredThrowableException u) {
         Throwable t = u.getCause();
         fail("Undeclared: "+t);
     } catch(Throwable t){
@@ -200,54 +200,54 @@ public class E&lt;IMG class="emoticon" s
     }
 
     try {
-        one.run(new OneE&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());
-    } catch (OneE&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 e) {
-    } catch(UndeclaredThrowableE&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 u) {
+        one.run(new OneException());
+    } catch (OneException e) {
+    } catch(UndeclaredThrowableException u) {
         Throwable t = u.getCause();
-        fail("Undeclared: "+t); &lt;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; This will always be the code that
+        fail("Undeclared: "+t); // This will always be the code that
 </code></pre>
 
-<p>e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecutes
+<p>executes
         } catch(Throwable t){
             fail("Caught: "+t);
         }</p>
 
-<pre><code>    Two two = (Two) pro&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;y;
+<pre><code>    Two two = (Two) proxy;
     try {
-        two.run(new CommonE&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());
-    } catch (TwoE&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 e) {
-    } catch(UndeclaredThrowableE&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 u) {
+        two.run(new CommonException());
+    } catch (TwoException e) {
+    } catch(UndeclaredThrowableException u) {
         Throwable t = u.getCause();
-        fail("Undeclared: "+t); &lt;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; This will always be the code that
+        fail("Undeclared: "+t); // This will always be the code that
 </code></pre>
 
-<p>e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecutes
+<p>executes
         } catch(Throwable t){
             fail("Caught: "+t);
         }</p>
 
 <pre><code>    }
 
-    public static class CommonE&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 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 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 CommonE&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 static class CommonException extends Exception {
+    public CommonException() {
     }
     }
 
     public static interface One {
-    void run(Object o) throws OneE&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, CommonE&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;
+    void run(Object o) throws OneException, CommonException;
     }
 
-    public static class OneE&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 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 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 OneE&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 static class OneException extends Exception {
+    public OneException() {
     }
     }
 
     public static interface Two {
-    void run(Object o) throws TwoE&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, CommonE&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;
+    void run(Object o) throws TwoException, CommonException;
     }
 
-    public static class TwoE&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 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 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 TwoE&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 static class TwoException extends Exception {
+    public TwoException() {
     }
     }
 
@@ -255,7 +255,7 @@ public class E&lt;IMG class="emoticon" s
 </code></pre>
 
 <p>{
-            public Object invoke(Object 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, Method method, Object[]
+            public Object invoke(Object proxy, Method method, Object[]
  args) throws Throwable {
                 throw (Throwable)args[0]
 ;
@@ -263,27 +263,27 @@ public class E&lt;IMG class="emoticon" s
         }
     }</p>
 
-<p><a name="MultipleBusinessInterfaceHazzards-IllegalArgumentE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception">&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="MultipleBusinessInterfaceHazzards-IllegalArgumentException"></a></p>
 
-<h1>IllegalArgumentE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception</h1>
+<h1>IllegalArgumentException</h1>
 
 <p>This one is less of a runtime problem as doing this will cause things to
-fail up front.  When two java interfaces are implemented by 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 and
+fail up front.  When two java interfaces are implemented by a proxy and
 those two interfaces declare the <em>same method</em> but with <em>different return
-types</em> the VM 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 code will refuse to create 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 at all.    Take this
-code 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>
+types</em> the VM proxy code will refuse to create a proxy at all.  Take this
+code example:</p>
 
 <pre><code>import junit.framework.TestCase;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 
-&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;**
+/**
  * @version $Rev$ $Date$
- *&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;
-public class ReturnTest 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 {
+ */
+public class ReturnTest extends TestCase {
 
-    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 {
+    public void test() throws Exception {
     ClassLoader classLoader = this.getClass().getClassLoader();
         Class[]
 </code></pre>
@@ -292,19 +292,19 @@ public class ReturnTest e&lt;IMG class="
 
 <pre><code>    InvocationHandler h = new ReturnTest.TestInvocationHandler();
 
-    Object pro&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;y =
+    Object proxy =
 </code></pre>
 
-<p>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.newPro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yInstance(classLoader, interfaces, h);</p>
+<p>java.lang.reflect.Proxy.newProxyInstance(classLoader, interfaces, h);</p>
 
-<pre><code>    One one = (One) pro&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;y;
+<pre><code>    One one = (One) proxy;
     try {
         Object object = one.run(new ThingOne());
     } catch (Throwable t) {
         fail("Caught: " + t);
     }
 
-    Two two = (Two) pro&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;y;
+    Two two = (Two) proxy;
     try {
         Object object = two.run(new ThingTwo());
     } catch (Throwable t) {
@@ -331,7 +331,7 @@ public class ReturnTest e&lt;IMG class="
 </code></pre>
 
 <p>{
-            public Object invoke(Object 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, Method method, Object[]
+            public Object invoke(Object proxy, Method method, Object[]
  args) throws Throwable {
                 return args[0]
 ;
@@ -339,20 +339,20 @@ public class ReturnTest e&lt;IMG class="
         }
     }</p>
 
-<p>Running this code will result in the following 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:</p>
+<p>Running this code will result in the following exception:</p>
 
-<pre><code>java.lang.IllegalArgumentE&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: methods with same signature
+<pre><code>java.lang.IllegalArgumentException: methods with same signature
 </code></pre>
 
 <p>run(java.lang.Object) but incompatible return types: [class ReturnTest$ThingOne, class ReturnTest$ThingTwo]
         at
-sun.misc.Pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yGenerator.checkReturnTypes(Pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yGenerator.java:669)
+sun.misc.ProxyGenerator.checkReturnTypes(ProxyGenerator.java:669)
         at
-sun.misc.Pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yGenerator.generateClassFile(Pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yGenerator.java:420)
+sun.misc.ProxyGenerator.generateClassFile(ProxyGenerator.java:420)
         at
-sun.misc.Pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yGenerator.generatePro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yClass(Pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yGenerator.java:306)
-        at 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.getPro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yClass(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.java:501)
-        at 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.newPro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yInstance(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.java:581)
+sun.misc.ProxyGenerator.generateProxyClass(ProxyGenerator.java:306)
+        at java.lang.reflect.Proxy.getProxyClass(Proxy.java:501)
+        at java.lang.reflect.Proxy.newProxyInstance(Proxy.java:581)
         at ReturnTest.test(ReturnTest.java:36)
         at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
         at
@@ -360,7 +360,7 @@ sun.reflect.NativeMethodAccessorImpl.inv
         at
 sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
         at
-com.intellij.rt.e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ecution.junit2.JUnitStarter.main(JUnitStarter.java:32)</p>
+com.intellij.rt.execution.junit2.JUnitStarter.main(JUnitStarter.java:32)</p>
 
             </DIV>
           </P>

Modified: websites/staging/openejb/trunk/content/new-in-openejb-3.0.html
==============================================================================
--- websites/staging/openejb/trunk/content/new-in-openejb-3.0.html (original)
+++ websites/staging/openejb/trunk/content/new-in-openejb-3.0.html Tue Jul 12 18:06:32 2011
@@ -152,7 +152,7 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="NewinOpenEJB3.0-EJB3.0">&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="NewinOpenEJB3.0-EJB3.0"></a></p>
 
 <h1>EJB 3.0</h1>
 
@@ -160,17 +160,17 @@
 2.1, EJB 2.0, and EJB 1.1.  New features in EJB 3.0 include:</p>
 
 <ul>
-<li>Annotations instead of <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml</li>
+<li>Annotations instead of xml</li>
 <li>No home interfaces</li>
 <li>Business Interfaces</li>
 <li>Dependency Injection</li>
 <li>Intercpetors</li>
 <li>Java Persistence API</li>
-<li>Service Locator (ala SessionConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t.lookup)</li>
+<li>Service Locator (ala SessionContext.lookup)</li>
 <li>POJO-style beans</li>
 </ul>
 
-<p>EJB 2.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> features since OpenEJB 1.0 also include:
+<p>EJB 2.x features since OpenEJB 1.0 also include:
  - MessageDriven Beans
  - Container-Managed Persistence (CMP) 2.0
  - Timers</p>
@@ -182,11 +182,11 @@
 <p>JAX-WS and CORBA support will be added in future releases.  Support for the
 JAX-RPC API is not a planned feature.</p>
 
-<p><a name="NewinOpenEJB3.0-E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">tensionstoEJB3.0">&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="NewinOpenEJB3.0-ExtensionstoEJB3.0"></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">tensions to EJB 3.0</h1>
+<h1>Extensions to EJB 3.0</h1>
 
-<p><a name="NewinOpenEJB3.0-CMPviaJPA">&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="NewinOpenEJB3.0-CMPviaJPA"></a></p>
 
 <h2>CMP via JPA</h2>
 
@@ -197,19 +197,19 @@ use both CMP and JPA in the same applica
 that can come from using two competing persistence technologies against the
 same data.  Everything is ultimately JPA in the end.</p>
 
-<p><a name="NewinOpenEJB3.0-E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">tendedDependencyInjection">&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="NewinOpenEJB3.0-ExtendedDependencyInjection"></a></p>
 
-<h2>E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">tended Dependency Injection</h2>
+<h2>Extended Dependency Injection</h2>
 
 <p>Dependency Injection in EJB 3.0 via @Resource is largely limited to objects
 provided by the container, such as DataSources, JMS Topics and Queues.  It
 is possible for you to supply your own configuration information for
 injection, but standard rules allow for only data of type String,
 Character, Boolean, Integer, Short, Long, Double, Float and Byte.  If you
-needed a URL, 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, you'd have to have it injected as a String then
+needed a URL, for example, you'd have to have it injected as a String then
 convert it yourself to a URL.  This is just plain silly as the conversion
-of Strings to other basic data types has e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">isted in JavaBeans long before
-Enterprise JavaBeans e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">isted.  </p>
+of Strings to other basic data types has existed in JavaBeans long before
+Enterprise JavaBeans existed.  </p>
 
 <p>OpenEJB 3.0 supports injection of any data type for which you can supply a
 JavaBeans PropertyEditor.  We include several built-in PropertyEditors
@@ -228,32 +228,32 @@ public class MyBean {
 }
 </code></pre>
 
-<p><a name="NewinOpenEJB3.0-TheMETA-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">&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="NewinOpenEJB3.0-TheMETA-INF/env-entries.properties"></a></p>
 
-<h2>The 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</h2>
+<h2>The META-INF/env-entries.properties</h2>
 
 <p>Along the lines of injection, one of the last remaining things in EJB 3
-that people need 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 file for is to supply the value of
+that people need an ejb-jar.xml file for is to supply the value of
 env-entries.  Env Entries are the source of data for all user supplied data
 injected into your bean; the afore mentioned String, Boolean, Integer, etc.
  This is a very big burden as each env-entry is going to cost you 5 lines
-of <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 the complication of having to figure out how to add you bean
-declaration 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 as an override of 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">isting bean and not accidentally
+of xml and the complication of having to figure out how to add you bean
+declaration in xml as an override of an existing bean and not accidentally
 as a new bean.  All this can be very painful when all you want is to supply
 the value of a few @Resource String fields in you bean class.  </p>
 
-<p>To fi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> this, OpenEJB supports the idea of 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
+<p>To fix this, OpenEJB supports the idea of a META-INF/env-entries.properties
 file where we will look for the value of things that need injection that
 are not container controlled resources (i.e. datasources and things of that
 nature).  You can configure you ejbs via a properties file and skip the
-need for 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 and it's 5 lines per property madness.</p>
+need for an ejb-jar.xml and it's 5 lines per property madness.</p>
 
-<pre><code>blog = 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;acme.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;myblog
+<pre><code>blog = http://acme.org/myblog
 birthday = locale=en_US style=MEDIUM Mar 1, 1954
-homeDirectory = &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;home&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;esmith&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;
+homeDirectory = /home/esmith/
 </code></pre>
 
-<p><a name="NewinOpenEJB3.0-SupportforGlassFishdescriptors">&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="NewinOpenEJB3.0-SupportforGlassFishdescriptors"></a></p>
 
 <h2>Support for GlassFish descriptors</h2>
 
@@ -266,17 +266,17 @@ people using GlassFish as their final se
 testing EJBs via plain JUnit tests in their build and only have one set of
 vendor descriptors to maintain.</p>
 
-<p><a name="NewinOpenEJB3.0-JavaEE5EARandApplicationClientsupport">&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="NewinOpenEJB3.0-JavaEE5EARandApplicationClientsupport"></a></p>
 
 <h2>JavaEE 5 EAR and Application Client support</h2>
 
 <p>JavaEE 5 EARs and Application Clients can be deployed in addition to ejb
 jars.  EAR support is limited to ejbs, application clients, and libraries;
 WAR files and RAR files will be ignored.   Per the JavaEE 5 spec, the
-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">application.<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 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">application-client.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml files are
+META-INF/application.xml and META-INF/application-client.xml files are
 optional.</p>
 
-<p><a name="NewinOpenEJB3.0-ApplicationValidationforEJB3.0">&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="NewinOpenEJB3.0-ApplicationValidationforEJB3.0"></a></p>
 
 <h2>Application Validation for EJB 3.0</h2>
 
@@ -286,54 +286,54 @@ failures.  </p>
 
 <p>As usual validation failures (non-compliant issues with your application)
 are printed out in complier-style "all-at-once" output allowing you to see
-and fi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> all your issues in one go.  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, if you have 10
-@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 annotations that reference an invalid persistence unit,
+and fix all your issues in one go.  For example, if you have 10
+@PersistenceContext annotations that reference an invalid persistence unit,
 you get all 10 errors on the <em>first</em> deploy rather than one failure on the
 first deploy with 9 more failed deployments to go.</p>
 
 <p>Validation output comes in three levels.  The most verbose level will tell
 you in detail what you did wrong, what the options are, and what to do
-ne<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t... even including valid code and annotation usage tailored to your app
+next... even including valid code and annotation usage tailored to your app
 that you can copy and paste into your application.  Very ideal for
 beginners and people using OpenEJB in a classroom setting.</p>
 
-<p><a name="NewinOpenEJB3.0-MostconfigurableJNDInamesever">&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="NewinOpenEJB3.0-MostconfigurableJNDInamesever"></a></p>
 
 <h2>Most configurable JNDI names ever</h2>
 
-<p><a name="NewinOpenEJB3.0-GeneralImprovements">&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="NewinOpenEJB3.0-GeneralImprovements"></a></p>
 
 <h1>General Improvements</h1>
 
-<p><a name="NewinOpenEJB3.0-OnlineDeployment">&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="NewinOpenEJB3.0-OnlineDeployment"></a></p>
 
 <h2>Online Deployment</h2>
 
-<p><a name="NewinOpenEJB3.0-SecurityService">&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="NewinOpenEJB3.0-SecurityService"></a></p>
 
 <h2>Security Service</h2>
 
-<p><a name="NewinOpenEJB3.0-ConnectionPooling">&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="NewinOpenEJB3.0-ConnectionPooling"></a></p>
 
 <h2>Connection Pooling</h2>
 
-<p><a name="NewinOpenEJB3.0-ConfigurationOverriding">&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="NewinOpenEJB3.0-ConfigurationOverriding"></a></p>
 
 <h2>Configuration Overriding</h2>
 
-<p><a name="NewinOpenEJB3.0-Fle<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ibleJNDINameFormatting">&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="NewinOpenEJB3.0-FlexibleJNDINameFormatting"></a></p>
 
-<h2>Fle<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ible JNDI Name Formatting</h2>
+<h2>Flexible JNDI Name Formatting</h2>
 
-<p><a name="NewinOpenEJB3.0-CleanerEmbedding">&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="NewinOpenEJB3.0-CleanerEmbedding"></a></p>
 
 <h2>Cleaner Embedding</h2>
 
-<p><a name="NewinOpenEJB3.0-Tomcat6Support">&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="NewinOpenEJB3.0-Tomcat6Support"></a></p>
 
 <h2>Tomcat 6 Support</h2>
 
-<p><a name="NewinOpenEJB3.0-Businesslocalsremotable">&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="NewinOpenEJB3.0-Businesslocalsremotable"></a></p>
 
 <h2>Business locals remotable</h2>
 

Modified: websites/staging/openejb/trunk/content/october2007.html
==============================================================================
--- websites/staging/openejb/trunk/content/october2007.html (original)
+++ websites/staging/openejb/trunk/content/october2007.html Tue Jul 12 18:06:32 2011
@@ -155,9 +155,9 @@
           <p>OpenEJB 3.0 beta 1 released.
 First contribution from Jonathan Gallimore. (was anything checked in, if
 not yank this line)
-Completed E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">port Control (Cryptography) process.
+Completed Export Control (Cryptography) process.
 Completed integration with Tomcat 6.
-E<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">panded documentation and 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.
+Expanded documentation and examples.
 Activity on the user list has increased slightly since the release.</p>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/october2008.html
==============================================================================
--- websites/staging/openejb/trunk/content/october2008.html (original)
+++ websites/staging/openejb/trunk/content/october2008.html Tue Jul 12 18:06:32 2011
@@ -154,14 +154,14 @@
             <DIV id="PageContent">
           <p>The user base has grown significantly. The primary areas seem to be people
 replacing the JBoss Embedded platform with OpenEJB as an embedded container
-for either testing or Swing<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">GUI work and people using OpenEJB in Tomcat for
+for either testing or Swing/GUI work and people using OpenEJB in Tomcat for
 web work. There have also been some reports of very large applications
-getting ported to 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">ternal signs of adoption have increased as
+getting ported to OpenEJB. External signs of adoption have increased as
 well with some OpenEJB users popping up in other communities such as Maven
 asking for OpenEJB focused improvements in their tools, a half dozen or so
 very favorable blog entries from people outside the project and a recent
-thread on TheServerSide where many users e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">pressed they were considering
-leaving Spring for OpenEJB<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Tomcat or Glassfish.</p>
+thread on TheServerSide where many users expressed they were considering
+leaving Spring for OpenEJB/Tomcat or Glassfish.</p>
 
 <p>Development on the OpenEJB Eclipse Plugin continues strong. The
 still-in-development Eclipse plugin is attracting some interest and has
@@ -169,11 +169,11 @@ already received some contributions from
 individuals. Thanks goes out to Jonathan Gallimore for not succumbing to
 post-commit-status burnout as so many people do when first getting commit.
 The dedication is noted. Other larger areas of development have been a
-total overhaul of the 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 aspect of OpenEJB, first in the request
+total overhaul of the client/server aspect of OpenEJB, first in the request
 speed and throughput and secondly in request failover and retry. This had
 been a weak area for the project and these improvements will likely
 increase the number of people using the standalone version of OpenEJB
-(current major areas of use are embedded and Tomcat). Some e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">perimental
+(current major areas of use are embedded and Tomcat). Some experimental
 work on integrating OpenEJB with Spring has been done which when completed
 should prove to be a compelling feature.</p>
 

Modified: websites/staging/openejb/trunk/content/openejb-0.9.2.html
==============================================================================
--- websites/staging/openejb/trunk/content/openejb-0.9.2.html (original)
+++ websites/staging/openejb/trunk/content/openejb-0.9.2.html Tue Jul 12 18:06:32 2011
@@ -152,39 +152,39 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p>{e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">cerpt:hidden=true}
+          <p>{excerpt:hidden=true}
 <a href="openejb-0.9.2.html">OpenEJB 0.9.2</a>
  - June 5th, 2003</p>
 
-<pre><code>* [openejb-0.9.2.zip](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;dist.codehaus.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;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;distributions&lt;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-0.9.2.zip)
-* [openejb-0.9.2.tar.gz](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;dist.codehaus.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;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;distributions&lt;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-0.9.2.tar.gz)
-* [openejb-0.9.2-src.zip](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;dist.codehaus.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;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;distributions&lt;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-0.9.2-src.zip)
-* [openejb-0.9.2-src.tar.gz](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;dist.codehaus.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;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;distributions&lt;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-0.9.2-src.tar.gz)
+<pre><code>* [openejb-0.9.2.zip](http://dist.codehaus.org/openejb/distributions/openejb-0.9.2.zip)
+* [openejb-0.9.2.tar.gz](http://dist.codehaus.org/openejb/distributions/openejb-0.9.2.tar.gz)
+* [openejb-0.9.2-src.zip](http://dist.codehaus.org/openejb/distributions/openejb-0.9.2-src.zip)
+* [openejb-0.9.2-src.tar.gz](http://dist.codehaus.org/openejb/distributions/openejb-0.9.2-src.tar.gz)
 * [Release Notes](openejb-0.9.2.html)
 </code></pre>
 
-<p>{e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">cerpt}</p>
+<p>{excerpt}</p>
 
-<p><a name="OpenEJB0.9.2-Download">&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="OpenEJB0.9.2-Download"></a></p>
 
 <h1>Download</h1>
 
 <ul>
-<li><p>Binary: openejb-0.9.2 {[zip](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">openejb.codehaus.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dist<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-0.9.2.zip)
-, [tar.gz|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">openejb.codehaus.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dist<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-0.9.2.tar.gz]
+<li><p>Binary: openejb-0.9.2 {<a href="http://openejb.codehaus.org/dist/openejb-0.9.2.zip">zip</a>
+, [tar.gz|http://openejb.codehaus.org/dist/openejb-0.9.2.tar.gz]
 }</p></li>
-<li><p>Source: openejb-0.9.2-src {[zip](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">openejb.codehaus.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dist<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-0.9.2-src.zip)
-, [tar.gz|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">openejb.codehaus.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dist<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-0.9.2-src.tar.gz]
+<li><p>Source: openejb-0.9.2-src {<a href="http://openejb.codehaus.org/dist/openejb-0.9.2-src.zip">zip</a>
+, [tar.gz|http://openejb.codehaus.org/dist/openejb-0.9.2-src.tar.gz]
 }</p></li>
 </ul>
 
-<p><a name="OpenEJB0.9.2-Changelog">&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="OpenEJB0.9.2-Changelog"></a></p>
 
 <h1>Changelog</h1>
 
 <p>Enhancements:
 -    [725352](725352.html)
- Integration Support Servlet for Tomcat<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">OpenEJB
+ Integration Support Servlet for Tomcat/OpenEJB
 -    [749343](749343.html)
  Tomcat integration tools: Object invoker
 -    [749342](749342.html)
@@ -198,15 +198,15 @@
 -    [744270](744270.html)
  Create openejb.base variable
 -    [540425](540425.html)
- Make 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">ecutable from any directo
+ Make OpenEJB executable from any directo
 -    [732017](732017.html)
- Tomcat integration e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">plicit checks for openejb.home validity
+ Tomcat integration explicit checks for openejb.home validity
 -    [698103](698103.html)
  Config properties for Stateless Container</p>
 
-<p>Bugs fi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ed:
+<p>Bugs fixed:
 -    [687404](687404.html)
- java.io.FileNotFoundE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ception: logs<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb.log
+ java.io.FileNotFoundException: logs/openejb.log
 -    [703049](703049.html)
  CMP problems when embedded in Tomcat -- Database not found
 -    [725781](725781.html)
@@ -216,11 +216,11 @@
 -    [746771](746771.html)
  Stateless isIdentical bug
 -    [699025](699025.html)
- bin<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">validate.sh use dos eol format
+ bin/validate.sh use dos eol format
 -    [658834](658834.html)
  PrimaryKey loades twice
 -    [699044](699044.html)
- bin<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">validate.sh use dos eol format
+ bin/validate.sh use dos eol format
 -    [675760](675760.html)
  Entity remove() doesn't work with Supports trans attr</p>
 

Modified: websites/staging/openejb/trunk/content/openejb-1.0-beta-1.html
==============================================================================
--- websites/staging/openejb/trunk/content/openejb-1.0-beta-1.html (original)
+++ websites/staging/openejb/trunk/content/openejb-1.0-beta-1.html Tue Jul 12 18:06:32 2011
@@ -156,20 +156,20 @@
 <li>Release Date: August 28th, 2005</li>
 </ul>
 
-<p><a name="OpenEJB1.0Beta1-Download">&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="OpenEJB1.0Beta1-Download"></a></p>
 
 <h1>Download</h1>
 
 <ul>
-<li>Binary: openejb-1.0-beta1 {[zip](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">openejb.codehaus.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dist<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-1.0-beta1.zip)
-, [tar.gz|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">openejb.codehaus.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dist<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-1.0-beta1.tar.gz]
+<li>Binary: openejb-1.0-beta1 {<a href="http://openejb.codehaus.org/dist/openejb-1.0-beta1.zip">zip</a>
+, [tar.gz|http://openejb.codehaus.org/dist/openejb-1.0-beta1.tar.gz]
 }</li>
-<li>Source: openejb-1.0-beta1-src {[zip](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">openejb.codehaus.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dist<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-1.0-beta1-src.zip)
-, [tar.gz|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">openejb.codehaus.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dist<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-1.0-beta1-src.tar.gz]
-, [browse|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">cvs.codehaus.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">viewrep<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">~tag=v1_0beta1<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="" borde
 r="0">openejb1]
+<li>Source: openejb-1.0-beta1-src {<a href="http://openejb.codehaus.org/dist/openejb-1.0-beta1-src.zip">zip</a>
+, [tar.gz|http://openejb.codehaus.org/dist/openejb-1.0-beta1-src.tar.gz]
+, [browse|http://cvs.codehaus.org/viewrep/~tag=v1_0beta1/openejb/openejb1]
 }</li>
-<li>Updated [ejb-testing-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](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">1.0-beta1<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">ejb-testing-e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="ab
 smiddle" alt="" border="0">amples.zip)
-for the [Container Driven Testing Series|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.theserverside.com<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">articles<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">article.tss?l=ContainerDrivenTestingSeries]
+<li>Updated <a href="http://www.openejb.org/1.0-beta1/ejb-testing-examples.zip">ejb-testing-examples.zip</a>
+for the [Container Driven Testing Series|http://www.theserverside.com/articles/article.tss?l=ContainerDrivenTestingSeries]
 on TheServerSide.com</li>
 </ul>
 
@@ -177,22 +177,22 @@ on TheServerSide.com</li>
 Use the Latest Unstable, this release will not work for windows users
 {warning}</p>
 
-<p><a name="OpenEJB1.0Beta1-NewFeatures">&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="OpenEJB1.0Beta1-NewFeatures"></a></p>
 
 <h1>New Features</h1>
 
-<p><a name="OpenEJB1.0Beta1-EJB2.0Localinterfacesupport">&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="OpenEJB1.0Beta1-EJB2.0Localinterfacesupport"></a></p>
 
 <h2>EJB 2.0 Local interface support</h2>
 
 <p>OpenEJB now has support for EJB 2.0 Local Interfaces.  This is very nice
 for when OpenEJB is combined with Tomcat  or embedded in another
 application where Remote interfaces  are not always needed.  See the
-"Moviefun" 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 in the  source or binary distributions for how to use
+"Moviefun" example in the  source or binary distributions for how to use
 them.  Note that no other EJB 2.0 features (such as CMP 2 or MDBs)
-  are supported in the OpenEJB 1.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> codebase.</p>
+  are supported in the OpenEJB 1.x codebase.</p>
 
-<p><a name="OpenEJB1.0Beta1-CollapsedEARsupport">&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="OpenEJB1.0Beta1-CollapsedEARsupport"></a></p>
 
 <h2>Collapsed EAR support</h2>
 
@@ -204,39 +204,39 @@ into your webapp.  Combine this with an 
 complete mini-J2EE environment that can be  hosted in your Tomcat webapp
 space.</p>
 
-<p>See the "Moviefun" 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 in the distribution which will  be online for
+<p>See the "Moviefun" example in the distribution which will  be online for
 a short while here:</p>
 
-<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">demo1.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">moviefun](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">demo1.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">moviefun)</p>
+<p><a href="http://demo1.openejb.org/moviefun">http://demo1.openejb.org/moviefun</a></p>
 
-<p>(visit [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">demo1.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">moviefun<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">setup.jsp](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">demo1.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">moviefun<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">setup.jsp)
+<p>(visit <a href="http://demo1.openejb.org/moviefun/setup.jsp">http://demo1.openejb.org/moviefun/setup.jsp</a>
  to reset)</p>
 
-<p><a name="OpenEJB1.0Beta1-UnpackedEJBJarsupport">&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="OpenEJB1.0Beta1-UnpackedEJBJarsupport"></a></p>
 
 <h2>Unpacked EJB Jar support</h2>
 
 <p>It is now possible to deploy and run EJB apps that are not  in a *.jar
-archive.  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, for ejb app located at:</p>
+archive.  For example, for ejb app located at:</p>
 
-<pre><code>&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;home&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;jsmith&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;myejbapp&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;META-INF&lt;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.&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absm
 iddle" alt="" border="0"&gt;ml
+<pre><code>/home/jsmith/myejbapp/META-INF/ejb-jar.xml
 </code></pre>
 
 <p>Simply add a Deployments declaration to the openejb.conf  like the
 following:</p>
 
-<pre><code>&lt;Deployment dir="&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;home&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;jsmith&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;myejbapp" &lt;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;
+<pre><code>&lt;Deployment dir="/home/jsmith/myejbapp" /&gt;
 </code></pre>
 
-<p><a name="OpenEJB1.0Beta1-AutoDeployforSimpleApps">&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="OpenEJB1.0Beta1-AutoDeployforSimpleApps"></a></p>
 
 <h2>Auto Deploy for Simple Apps</h2>
 
-<p>In OpenEJB 1.0 beta1, the use of openejb-jar.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml is not  required 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 files that do not contain CMP  EntityBeans or ejbs with
+<p>In OpenEJB 1.0 beta1, the use of openejb-jar.xml is not  required for
+ejb-jar.xml files that do not contain CMP  EntityBeans or ejbs with
 multiple datasource references.</p>
 
-<p><a name="OpenEJB1.0Beta1-MacOSXUsers">&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="OpenEJB1.0Beta1-MacOSXUsers"></a></p>
 
 <h2>Mac OSX Users</h2>
 
@@ -245,11 +245,11 @@ compensate for differing default paramet
 closing in the Mac OSX Java VM.  This makes sequential  calls from a Remote
 Client to the Server several times faster.</p>
 
-<p><a name="OpenEJB1.0Beta1-UpgradeNotes">&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="OpenEJB1.0Beta1-UpgradeNotes"></a></p>
 
 <h1>Upgrade Notes</h1>
 
-<p><a name="OpenEJB1.0Beta1-CMPconfigchange">&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="OpenEJB1.0Beta1-CMPconfigchange"></a></p>
 
 <h2>CMP config change</h2>
 
@@ -259,45 +259,45 @@ use on all requests into the CMP contain
 something like this:</p>
 
 <pre><code>&lt;database name="Global_TX_Database" engine="instantdb"&gt;
-   &lt;jndi name="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;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;basic&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;entityDatabase" &lt;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;mapping href="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;default.cmp_mapping.&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ml" &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&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;database&gt;
+   &lt;jndi name="java:comp/env/jdbc/basic/entityDatabase" /&gt;
+   &lt;mapping href="conf/default.cmp_mapping.xml" /&gt;
+&lt;/database&gt;
 </code></pre>
 
 <p>This was just wrong.  We've switched it so that the "jndi" tag of a Castor
-database.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml file can be set directly to the global JNDI name of a
+database.xml file can be set directly to the global JNDI name of a
 Connector element declared in an openejb.conf file.  </p>
 
 <pre><code> &lt;database name="Global_TX_Database" engine="instantdb"&gt;
-     &lt;jndi name="java: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;connector&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Default JDBC Database" &lt;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;mapping href="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;default.cmp_mapping.&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;ml" &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&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;database&gt;
+     &lt;jndi name="java:openejb/connector/Default JDBC Database" /&gt;
+     &lt;mapping href="conf/default.cmp_mapping.xml" /&gt;
+ &lt;/database&gt;
 </code></pre>
 
 <p>This is still not so optimal as we do not want to people using OpenEJB's
 internal jndi and encourage people to become dependent on it.  Newer
 releases of Castor allow for a completely programmatic way to configure a
 JDO database.  In future releases, these global and local database files
-will go away all together!  You will only need to specify your mapping.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml
+will go away all together!  You will only need to specify your mapping.xml
 and will be able to pack it in your ejb jar.</p>
 
-<p><a name="OpenEJB1.0Beta1-ClassLoaderchange">&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="OpenEJB1.0Beta1-ClassLoaderchange"></a></p>
 
 <h2>ClassLoader change</h2>
 
 <p>In 0.9.2 all EJBs were added to the same classloader as the Containers,
 Server and all the other EJBs.  In 1.0 beta1, all the EJBs are still in the
 same classloader, but one that is a child of the  Container and Server. 
-The code to keep each EJB jar in it's own classloader does 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, but
+The code to keep each EJB jar in it's own classloader does exist, but
 limitations in the way we configure the CMP container with Castor prevent
-us from using it.  When the CMP change made above is fi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ed, we will support
+us from using it.  When the CMP change made above is fixed, we will support
 separate classloaders for each EJB jar as an option.</p>
 
-<p><a name="OpenEJB1.0Beta1-Changelog">&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="OpenEJB1.0Beta1-Changelog"></a></p>
 
 <h1>Changelog</h1>
 
-<p>{jiraissues:url=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">jira.codehaus.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">secure<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">IssueNavigator.jspa?view=rss&amp;pid=10401&amp;fi<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">for=11983&amp;sorter<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.g
 if" height="16" width="16" align="absmiddle" alt="" border="0">field=issuekey&amp;sorter<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">order=DESC&amp;reset=true&amp;decorator=none|columns=key,summary}</p>
+<p>{jiraissues:url=http://jira.codehaus.org/secure/IssueNavigator.jspa?view=rss&amp;pid=10401&amp;fixfor=11983&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;reset=true&amp;decorator=none|columns=key,summary}</p>
 
             </DIV>
           </P>