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

Modified: websites/staging/openejb/trunk/content/getting-started.html
==============================================================================
--- websites/staging/openejb/trunk/content/getting-started.html (original)
+++ websites/staging/openejb/trunk/content/getting-started.html Tue Jul 12 18:06:32 2011
@@ -170,31 +170,31 @@
   
 </blockquote>
 
-<p><a name="GettingStarted-&nbsp;1.DownloadandInstallOpenEJB">&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="GettingStarted-&nbsp;1.DownloadandInstallOpenEJB"></a></p>
 
 <h2>1. Download and Install OpenEJB</h2>
 
-<p>Follow these&nbsp;[instructions](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">cwiki.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">confluence<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">display<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="a
 bsmiddle" alt="" border="0">Quickstart)</p>
+<p>Follow these&nbsp;<a href="http://cwiki.apache.org/confluence/display/OPENEJB/Quickstart">instructions</a></p>
 
-<p><a name="GettingStarted-&nbsp;2.Setupyourdevelopmentenvironment">&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="GettingStarted-&nbsp;2.Setupyourdevelopmentenvironment"></a></p>
 
 <h2>2. Setup your development environment</h2>
 
-<p><a name="GettingStarted-&nbsp;Eclipse">&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="GettingStarted-&nbsp;Eclipse"></a></p>
 
 <h3>Eclipse</h3>
 
 <ul>
 <li>Open eclipse and create a new java project. Name it EJBProject</li>
 <li>Add the following jars to the build path of your project
--- OPENEJB_HOME<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">lib<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">geronimo-ejb_3.0_spec-1.0.jar</li>
+-- OPENEJB_HOME/lib/geronimo-ejb_3.0_spec-1.0.jar</li>
 <li>Now create another project named EJBClient. This is where we will write a test client</li>
 <li>Add the following jars to the build path of this project
--- OPENEJB_HOME<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">lib<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-client-3.0.0-SNAPSHOT.jar</li>
+-- OPENEJB_HOME/lib/openejb-client-3.0.0-SNAPSHOT.jar</li>
 <li>Add the EJBProject to the classpath of the EJBClient project</li>
 </ul>
 
-<p><a name="GettingStarted-&nbsp;3.StarttheServer">&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="GettingStarted-&nbsp;3.StarttheServer"></a></p>
 
 <h2>3. Start the Server</h2>
 
@@ -207,7 +207,7 @@
 
 <pre><code>D:\openejb-3.0.0-SNAPSHOT&gt;bin\openejb start
 Apache OpenEJB 3.0.0-SNAPSHOT    build: 20070830-07:53
-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;openejb.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;
+http://openejb.apache.org/
 OpenEJB ready.
 [OPENEJB:init]
  OpenEJB Remote Server
@@ -222,7 +222,7 @@ OpenEJB ready.
     Ready!
 </code></pre>
 
-<p><a name="GettingStarted-&nbsp;4.WriteanEJB">&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="GettingStarted-&nbsp;4.WriteanEJB"></a></p>
 
 <h2>4. Write an EJB</h2>
 
@@ -230,7 +230,7 @@ OpenEJB ready.
 
 <pre><code>package com.myejbs;
 
-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.Remote;
+import javax.ejb.Remote;
 
 @Remote
 public interface Greeting {
@@ -243,7 +243,7 @@ interface (shown below)</p>
 
 <pre><code>package com.myejbs;
 
-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 javax.ejb.Stateless;
 
 @Stateless
 public class GreetingBean implements Greeting {
@@ -255,13 +255,13 @@ public class GreetingBean implements Gre
 }
 </code></pre>
 
-<p><a name="GettingStarted-&nbsp;5.DeploytheEJB">&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="GettingStarted-&nbsp;5.DeploytheEJB"></a></p>
 
 <h2>5. Deploy the EJB</h2>
 
 <ol>
-<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">port the EJBProject as a jar file. Name it greeting.jar and put it in
-the OPENEJB_HOME<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">apps directory.</li>
+<li>Export the EJBProject as a jar file. Name it greeting.jar and put it in
+the OPENEJB_HOME/apps directory.</li>
 <li><p>Open the command prompt and type in the following command:</p>
 
 <p>d:\openejb-3.0.0-SNAPSHOT > bin\openejb deploy apps\greeting.jar</p></li>
@@ -286,7 +286,7 @@ App(id=D:\openejb-3.0.0-SNAPSHOT\apps\gr
 Keep this handy as this is the JNDI name of the bean which the client will
 use for lookup{</em>}{color}</p>
 
-<p><a name="GettingStarted-&nbsp;6.WritetheClient">&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="GettingStarted-&nbsp;6.WritetheClient"></a></p>
 
 <h2>6. Write the Client</h2>
 
@@ -296,7 +296,7 @@ use for lookup{</em>}{color}</p>
 
 import com.myejbs.Greeting;
 
-import java&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;.naming.InitialConte&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;t;
+import javax.naming.InitialContext;
 import java.util.Properties;
 
 public class Client {
@@ -304,20 +304,20 @@ public class Client {
 
         try {
             Properties p = new Properties();
-            p.put("java.naming.factory.initial", "org.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;127.0.0.1:4201");
-            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);
-            Greeting greeter = (Greeting) 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("GreetingBeanRemote");
+            p.put("java.naming.factory.initial", "org.openejb.client.RemoteInitialContextFactory");
+            p.put("java.naming.provider.url", "ejbd://127.0.0.1:4201");
+            InitialContext ctx = new InitialContext(p);
+            Greeting greeter = (Greeting) ctx.lookup("GreetingBeanRemote");
             String message = greeter.greet();
             System.out.println(message);
-        } catch (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 e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 }
 </code></pre>
 
-<p><a name="GettingStarted-&nbsp;7.RuntheClient">&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="GettingStarted-&nbsp;7.RuntheClient"></a></p>
 
 <h2>7. Run the Client</h2>
 
@@ -327,7 +327,7 @@ see the following message in the console
 <pre><code>My First Remote Stateless Session Bean
 </code></pre>
 
-<p><a name="GettingStarted-&nbsp;8.Stoptheserver">&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="GettingStarted-&nbsp;8.Stoptheserver"></a></p>
 
 <h2>8. Stop the server</h2>
 

Modified: websites/staging/openejb/trunk/content/hello-world.html
==============================================================================
--- websites/staging/openejb/trunk/content/hello-world.html (original)
+++ websites/staging/openejb/trunk/content/hello-world.html Tue Jul 12 18:06:32 2011
@@ -157,17 +157,17 @@ and EJB client in its most minimum form.
 special build tools or IDEs and is about the most stripped down you can
 get.</p>
 
-<p><em>See 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">amples](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.html)
- page for a full list of 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 that range from [@Stateles|Simple Stateless 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]
- and [@Stateful|Simple Stateful 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]
- beans, to [Dependency Injection|Injection of env-entry 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]
-, JDBC [DataSources|Injection of DataSource 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]
-, JPA [EntityManagers|Injection of EntityManager 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><em>See the <a href="examples.html">Examples</a>
+ page for a full list of examples that range from [@Stateles|Simple Stateless Example]
+ and [@Stateful|Simple Stateful Example]
+ beans, to [Dependency Injection|Injection of env-entry Example]
+, JDBC [DataSources|Injection of DataSource Example]
+, JPA [EntityManagers|Injection of EntityManager Example]
  and more.</em></p>
 
-<p><a name="HelloWorld-AbasicEJBe<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample">&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="HelloWorld-AbasicEJBexample"></a></p>
 
-<h2>A basic 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">ample</h2>
+<h2>A basic EJB example</h2>
 
 <p>Here are some basic steps you need to perform to get started with OpenEJB</p>
 
@@ -182,20 +182,20 @@ get.</p>
 <li>Stop the server</li>
 </ol>
 
-<p><a name="HelloWorld-DownloadandinstallOpenEJB">&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="HelloWorld-DownloadandinstallOpenEJB"></a></p>
 
 <h2>Download and install OpenEJB</h2>
 
-<p>This e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample pertains to OpenEJB 3.0 which can be [downloaded here](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">archive.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">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<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="
 16" width="16" align="absmiddle" alt="" border="0">3.0)
-.  Once you have downloaded OpenEJB, you can then simply e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">tract the
+<p>This example pertains to OpenEJB 3.0 which can be <a href="http://archive.apache.org/dist/openejb/3.0">downloaded here</a>
+.  Once you have downloaded OpenEJB, you can then simply extract the
 contents of the downloaded file to whichever directory you want to install
 OpenEJB in. </p>
 
-<p>After e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">tracting the file contents, you should now see a directory named
+<p>After extracting the file contents, you should now see a directory named
 openejb-3.0. If you look under this directory, you will find a few more
 directories:
-- <em>bin</em>: Contains commands to start<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">stop the server (You can also do a lot
-of other stuff like deploy<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">undeploy, but we will just talk about things
+- <em>bin</em>: Contains commands to start/stop the server (You can also do a lot
+of other stuff like deploy/undeploy, but we will just talk about things
 needed to get you started)
 - <em>lib</em>: Contains several jar files (you only need of few of these jars in
 your classpath to do EJB development)
@@ -203,17 +203,17 @@ your classpath to do EJB development)
 jar file in this directory and start the server. The server will
 automatically deploy all the EJB's contained in this JAR.
 - <em>conf</em>: This directory contains all the configuration files. Although you
-may not see any file e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">cept for a README.t<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t file right now, but after you
+may not see any file except for a README.txt file right now, but after you
 start the server, the required configuration files will be automatically
-created. It is highly recommeded to read the README.t<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t file under this
+created. It is highly recommeded to read the README.txt file under this
 directory
 - <em>logs</em>: Contains log files. </p>
 
-<p><a name="HelloWorld-Setupyourdevelopmentenvironment">&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="HelloWorld-Setupyourdevelopmentenvironment"></a></p>
 
 <h2>Setup your development environment</h2>
 
-<p><a name="HelloWorld-Createaworkingdirectory">&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="HelloWorld-Createaworkingdirectory"></a></p>
 
 <h3>Create a working directory</h3>
 
@@ -228,50 +228,50 @@ directory
 </code></pre>
 
 <p>We will do all our work in this directory.
-<a name="HelloWorld-InstallJava">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="HelloWorld-InstallJava"></a></p>
 
 <h3>Install Java</h3>
 
 <p>Download and install Java (version 5 or higher). Also set it up so that you
 can run the java and javac commands from any directory
-<a name="HelloWorld-SetOPENEJB_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">a></p>
+<a name="HelloWorld-SetOPENEJB_HOME"></a></p>
 
 <h3>Set OPENEJB_HOME</h3>
 
 <p>We will setup this variable to refer to the openejb install location.</p>
 
-<pre><code>karan@poweredge:~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;projects$ 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;port
+<pre><code>karan@poweredge:~/projects$ export
 </code></pre>
 
-<p>OPENEJB_HOME=<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">home<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">karan<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">install<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0</p>
+<p>OPENEJB_HOME=/home/karan/install/openejb-3.0</p>
 
-<p><a name="HelloWorld-WriteanEJB">&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="HelloWorld-WriteanEJB"></a></p>
 
 <h2>Write an EJB</h2>
 
 <p>Whatever files you create should be placed under the projects directory
-<a name="HelloWorld-CreatetheRemoteInterface">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="HelloWorld-CreatetheRemoteInterface"></a></p>
 
 <h3>Create the Remote Interface</h3>
 
 <p>Using your favorite editor, create a file named Hello.java (shown below)</p>
 
 <pre><code>package org.acme;
-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.Remote;
+import javax.ejb.Remote;
 @Remote
 public interface Hello{
     public String sayHello();
 }
 </code></pre>
 
-<p><a name="HelloWorld-CreatetheBeanClass">&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="HelloWorld-CreatetheBeanClass"></a></p>
 
 <h3>Create the Bean Class</h3>
 
 <p>Now create a file named HelloBean.java (shown below)</p>
 
 <pre><code>package org.acme;
-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 javax.ejb.Stateless;
 @Stateless
 public class HelloBean implements Hello{
     public String sayHello(){
@@ -280,46 +280,46 @@ public class HelloBean implements Hello{
 }
 </code></pre>
 
-<p><a name="HelloWorld-Compilethesourcecode">&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="HelloWorld-Compilethesourcecode"></a></p>
 
 <h3>Compile the source code</h3>
 
-<p>Since we have imported the java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.ejb.Stateless and java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.ejb.Remote
+<p>Since we have imported the javax.ejb.Stateless and javax.ejb.Remote
 annotations, we need these in our classpath to compile our source code.
-These annotations can be found in the $OPENEJB_HOME<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">lib<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">javaee-5.0-1.jar.
+These annotations can be found in the $OPENEJB_HOME/lib/javaee-5.0-1.jar.
 Lets compile our source (make sure you are in the projects directory)</p>
 
-<pre><code>karan@poweredge:~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;projects$ javac -cp $OPENEJB_HOME&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;lib&lt;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-5.0-1.jar -d
+<pre><code>karan@poweredge:~/projects$ javac -cp $OPENEJB_HOME/lib/javaee-5.0-1.jar -d
 </code></pre>
 
 <p>. *.java</p>
 
 <p>The above will compile all the .java files and also create the required
 packages. You should now see a package named org under the projects
-directory. All class files should be under org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">acme directory.
-<a name="HelloWorld-PackagetheEJB">&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>
+directory. All class files should be under org/acme directory.
+<a name="HelloWorld-PackagetheEJB"></a></p>
 
 <h3>Package the EJB</h3>
 
 <p>To package the EJB into a JAR, run the following command while you are in
 the projects directory</p>
 
-<pre><code>karan@poweredge:~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;projects$ jar cvf hello.jar org
+<pre><code>karan@poweredge:~/projects$ jar cvf hello.jar org
 </code></pre>
 
 <p>The above command will package everything under the org directory
 (including the org directory itself) into a jar file named hello.jar. Below
 is the output from running the above command:</p>
 
-<pre><code>karan@poweredge:~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;projects$ jar cvf hello.jar org
+<pre><code>karan@poweredge:~/projects$ jar cvf hello.jar org
 added manifest
-adding: 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;(in = 0) (out= 0)(stored 0%)
-adding: 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;acme&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;(in = 0) (out= 0)(stored 0%)
-adding: 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;acme&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Hello.class(in = 203) (out= 168)(deflated 17%)
-adding: 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;acme&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;HelloBean.class(in = 383) (out= 275)(deflated 28%)
+adding: org/(in = 0) (out= 0)(stored 0%)
+adding: org/acme/(in = 0) (out= 0)(stored 0%)
+adding: org/acme/Hello.class(in = 203) (out= 168)(deflated 17%)
+adding: org/acme/HelloBean.class(in = 383) (out= 275)(deflated 28%)
 </code></pre>
 
-<p><a name="HelloWorld-WriteanEJBClient">&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="HelloWorld-WriteanEJBClient"></a></p>
 
 <h2>Write an EJB Client</h2>
 
@@ -330,20 +330,20 @@ HelloClient.java . Add the following to 
 
 <pre><code>package org.acme;
 import java.util.Properties;
-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 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;
-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;.rmi.PortableRemoteObject;
+import javax.naming.InitialContext;
+import javax.naming.Context;
+import javax.rmi.PortableRemoteObject;
 public class HelloClient{
         public static void main(String[]
 </code></pre>
 
-<p>args) 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{
+<p>args) throws Exception{
             Properties props = new Properties();</p>
 
-<p>props.put(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.INITIAL_CONTEXT_FACTORY,"org.apache.openejb.client.RemoteInitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">tFactory");
-            props.put(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.PROVIDER_URL,"ejbd:<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">127.0.0.1:4201");
-            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 ct<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"> = new InitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t(props);
-            Object ref = ct<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.lookup("HelloBeanRemote");
+<p>props.put(Context.INITIAL_CONTEXT_FACTORY,"org.apache.openejb.client.RemoteInitialContextFactory");
+            props.put(Context.PROVIDER_URL,"ejbd://127.0.0.1:4201");
+            Context ctx = new InitialContext(props);
+            Object ref = ctx.lookup("HelloBeanRemote");
             Hello h =
 (Hello)PortableRemoteObject.narrow(ref,Hello.class);
             String result = h.sayHello();
@@ -351,31 +351,31 @@ public class HelloClient{
         }
     }</p>
 
-<p><a name="HelloWorld-CompileHelloClient.java">&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="HelloWorld-CompileHelloClient.java"></a></p>
 
 <h3>Compile HelloClient.java</h3>
 
 <p>Run the following command:</p>
 
-<pre><code>karan@poweredge:~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;projects$ javac  -d . HelloClient.java
+<pre><code>karan@poweredge:~/projects$ javac  -d . HelloClient.java
 </code></pre>
 
-<p><a name="HelloWorld-StarttheServer">&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="HelloWorld-StarttheServer"></a></p>
 
 <h2>Start the Server</h2>
 
 <p>Go to the OpenEJB install directory (i.e. OPENEJB_HOME) and run the
 following command:</p>
 
-<pre><code>karan@poweredge:~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;install&lt;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-3.0$ bin&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb start
+<pre><code>karan@poweredge:~/install/openejb-3.0$ bin/openejb start
 </code></pre>
 
 <p>Once the Server starts, you will see an output similar to the below in your
 console:</p>
 
-<pre><code>karan@poweredge:~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;install&lt;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-3.0$ bin&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb start
+<pre><code>karan@poweredge:~/install/openejb-3.0$ bin/openejb start
 Apache OpenEJB 3.0    build: 20070926-12:34
-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;openejb.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;
+http://openejb.apache.org/
 OpenEJB ready.
 [OPENEJB:init]
 </code></pre>
@@ -394,22 +394,22 @@ OpenEJB ready.
 <p>Take out a minute to browse through the conf and logs directories. You
 should now see some configuration and log files under the respective
 directories. 
-<a name="HelloWorld-DeploytheEJB">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="HelloWorld-DeploytheEJB"></a></p>
 
 <h2>Deploy the EJB</h2>
 
 <p>We will now use the deploy command to deploy the EJB in hello.jar. While
 you are in the projects directory, run the following command:</p>
 
-<pre><code>karan@poweredge:~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;projects$ $OPENEJB_HOME&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;bin&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb deploy hello.jar
+<pre><code>karan@poweredge:~/projects$ $OPENEJB_HOME/bin/openejb deploy hello.jar
 </code></pre>
 
 <p>The above command should give you the following output:</p>
 
-<pre><code>karan@poweredge:~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;projects$ $OPENEJB_HOME&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;bin&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;openejb deploy hello.jar
+<pre><code>karan@poweredge:~/projects$ $OPENEJB_HOME/bin/openejb deploy hello.jar
 Application deployed successfully at "hello.jar"
-App(id=&lt;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;karan&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;projects&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;hello.jar)
-    EjbJar(id=hello.jar, path=&lt;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;karan&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;projects&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;hello.jar)
+App(id=/home/karan/projects/hello.jar)
+    EjbJar(id=hello.jar, path=/home/karan/projects/hello.jar)
     Ejb(ejb-name=HelloBean, id=HelloBean)
         Jndi(name=HelloBeanRemote)
 </code></pre>
@@ -417,17 +417,17 @@ App(id=&lt;IMG class="emoticon" src="htt
 <p>Notice how the output neatly lays out various deployment details. One thing
 you might want to note from the output is the JNDI name. This is the JNDI
 name we used in the client to lookup the EJB
-<a name="HelloWorld-RuntheClient">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+<a name="HelloWorld-RuntheClient"></a></p>
 
 <h2>Run the Client</h2>
 
 <p>While you are in the projects directory, run the following command to run
 the client:</p>
 
-<pre><code>karan@poweredge:~&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;projects$ java -cp
+<pre><code>karan@poweredge:~/projects$ java -cp
 </code></pre>
 
-<p>$OPENEJB_HOME<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">lib<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-client-3.0.jar:$OPENEJB_HOME<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">lib<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">javaee-5.0-1.jar:.
+<p>$OPENEJB_HOME/lib/openejb-client-3.0.jar:$OPENEJB_HOME/lib/javaee-5.0-1.jar:.
  org.acme.HelloClient</p>
 
 <p>The above should give you the following output:</p>
@@ -435,19 +435,19 @@ the client:</p>
 <pre><code>Hello World!!!!
 </code></pre>
 
-<p><a name="HelloWorld-Help!,itdidn'tworkforme!!.">&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="HelloWorld-Help!,itdidn'tworkforme!!."></a></p>
 
 <h2>Help! , it didn't work for me!!.</h2>
 
 <p>No problem, we are here to help. Just send us an email at
 users@openejb.apache.org. If possible, send us the contents of
-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 file in the email. </p>
+logs/openejb.log file in the email. </p>
 
-<p><a name="HelloWorld-Lookingformore?">&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="HelloWorld-Lookingformore?"></a></p>
 
 <h1>Looking for more?</h1>
 
-<p>More EJB 3.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">amples, sample applications, tutorials and howtos available [here](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.html)
+<p>More EJB 3.0 examples, sample applications, tutorials and howtos available <a href="examples.html">here</a>
 .</p>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/hibernate.html
==============================================================================
--- websites/staging/openejb/trunk/content/hibernate.html (original)
+++ websites/staging/openejb/trunk/content/hibernate.html Tue Jul 12 18:06:32 2011
@@ -152,31 +152,31 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="Hibernate-Samplepersistence.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">a></p>
+          <p><a name="Hibernate-Samplepersistence.xml"></a></p>
 
-<h1>Sample persistence.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml</h1>
+<h1>Sample persistence.xml</h1>
 
 <p>For a unit called "movie-unit" using two datasources called "movieDatabase"
-and "movieDatabaseUnmanaged" the following persistence.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml would work.</p>
+and "movieDatabaseUnmanaged" the following persistence.xml would work.</p>
 
 <pre><code>&lt;persistence version="1.0"
-       &lt;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="absmiddle" alt=""
  border="0"&gt;ns&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;persistence"
-       &lt;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:&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;si="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.w3.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;2001&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt
 ="" border="0"&gt;XMLSchema-instance"
-       &lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;si:schemaLocation="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="absm
 iddle" alt="" border="0"&gt;ns&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;persistence
-       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="absmiddle" alt="" border="0"&gt;ns&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" bor
 der="0"&gt;persistence&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;persistence_1_0.&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;sd"&gt;
+       xmlns="http://java.sun.com/xml/ns/persistence"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+       http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"&gt;
 
   &lt;persistence-unit name="movie-unit"&gt;
-    &lt;provider&gt;org.hibernate.ejb.HibernatePersistence&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;provider&gt;
-    &lt;jta-data-source&gt;movieDatabase&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;jta-data-source&gt;
-    &lt;non-jta-data-source&gt;movieDatabaseUnmanaged&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;non-jta-data-source&gt;
+    &lt;provider&gt;org.hibernate.ejb.HibernatePersistence&lt;/provider&gt;
+    &lt;jta-data-source&gt;movieDatabase&lt;/jta-data-source&gt;
+    &lt;non-jta-data-source&gt;movieDatabaseUnmanaged&lt;/non-jta-data-source&gt;
 
     &lt;properties&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.hbm2ddl.auto" value="create-drop"/&gt;
       &lt;property name="hibernate.transaction.manager_lookup_class"
-                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;
-  &lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;persistence-unit&gt;
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;persistence&gt;
+                value="org.apache.openejb.hibernate.TransactionManagerLookup"/&gt;
+    &lt;/properties&gt;
+  &lt;/persistence-unit&gt;
+&lt;/persistence&gt;
 </code></pre>
 
 <p>Note that as of OpenEJB 3.1 you do not need to set the
@@ -204,9 +204,9 @@ like the following will do the trick.  T
 "DynamicTransactionManagerLookup" class can be packed in your jar and
 deployed with your app.</p>
 
-<pre><code>import org.hibernate.HibernateE&lt;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;
+<pre><code>import org.hibernate.HibernateException;
 import org.hibernate.transaction.TransactionManagerLookup;
-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;.transaction.TransactionManager;
+import javax.transaction.TransactionManager;
 import java.util.Properties;
 
 public class DynamicTransactionManagerLookup implements TransactionManagerLookup {
@@ -224,14 +224,14 @@ public class DynamicTransactionManagerLo
                 Class&lt;?&gt; clazz = this.getClass().getClassLoader().loadClass(className);
                 impl = (TransactionManagerLookup) clazz.newInstance();
                 break;
-            } catch (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 e) {
+            } catch (Exception e) {
             }
         }
 
-        if (impl == null) throw new IllegalStateE&lt;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("No TransactionManagerLookup available");
+        if (impl == null) throw new IllegalStateException("No TransactionManagerLookup available");
     }
 
-    public TransactionManager getTransactionManager(Properties properties) throws HibernateE&lt;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 TransactionManager getTransactionManager(Properties properties) throws HibernateException {
         return impl.getTransactionManager(properties);
     }
 
@@ -249,12 +249,12 @@ that you just created.</p>
 I tried to use openejb 3.0 together with hibernate 3.2.6ga in a maven
 project. The transitive dependencies of openejb and hibernate collide on
 asm.jar. A similar problem is described here:
-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">blog.springsource.com<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">main<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">2007<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">06<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">11<IMG class="emo
 ticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">asm-version-incompatibilities-using-spring-autowired-with-hibernate<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">
+http://blog.springsource.com/main/2007/06/11/asm-version-incompatibilities-using-spring-autowired-with-hibernate/
 or here:
-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">forum.springframework.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">showthread.php?t=26713&amp;highlight=cglib-nodep+hibernate
-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.springframework.org<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">browse<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">SPR-3856</p>
+http://forum.springframework.org/showthread.php?t=26713&amp;highlight=cglib-nodep+hibernate
+http://jira.springframework.org/browse/SPR-3856</p>
 
-<p>The solution is to e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">clude the dependency on asm and cglib on hibernate and
+<p>The solution is to exclude the dependency on asm and cglib on hibernate and
 to add a dependency on cglib-nodep.
 {info}</p>
 

Modified: websites/staging/openejb/trunk/content/index.html
==============================================================================
--- websites/staging/openejb/trunk/content/index.html (original)
+++ websites/staging/openejb/trunk/content/index.html Tue Jul 12 18:06:32 2011
@@ -167,7 +167,7 @@
 <li><a href="security-annotations.html">Security Annotations</a></li>
 <li><a href="transaction-annotations.html">Transaction Annotations</a></li>
 <li><a href="ejb-refs.html">EJB Refs</a></li>
-<li>[XML Overrides](annotations,-<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-defaults.html)</li>
+<li><a href="annotations,-xml-and-defaults.html">XML Overrides</a></li>
 <li><a href="jpa-concepts.html">JPA Concepts</a></li>
 </ol></li>
 <li><em>EJB 3.1 Applications</em>
@@ -216,13 +216,13 @@
 <ol>
 <li><a href="spring-and-openejb-3.0.html">Spring and OpenEJB 3.0</a></li>
 <li><a href="spring.html">Spring and OpenEJB 3.1 and later</a></li>
-<li><a href="spring-ejb-and-jpa.html">Spring, EJB and JPA 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></li>
+<li><a href="spring-ejb-and-jpa.html">Spring, EJB and JPA example</a></li>
 </ol></li>
 <li><em>Advanced</em>
 <ol>
 <li><a href="failover.html">Failover</a></li>
 </ol></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">amples](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.html)</li>
+<li><a href="examples.html">Examples</a></li>
 </ol>
 
             </DIV>

Modified: websites/staging/openejb/trunk/content/injection-of-datasource-example.html
==============================================================================
--- websites/staging/openejb/trunk/content/injection-of-datasource-example.html (original)
+++ websites/staging/openejb/trunk/content/injection-of-datasource-example.html Tue Jul 12 18:06:32 2011
@@ -152,26 +152,26 @@
           <P>
             <!-- $BODY -->
             <DIV id="PageContent">
-          <p><a name="InjectionofDataSourceE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample-Overview">&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="InjectionofDataSourceExample-Overview"></a></p>
 
 <h1>Overview</h1>
 
-<p>{span:style=float: right; margin-left: 20p<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">;}
+<p>{span:style=float: right; margin-left: 20px;}
 {html}</p>
 
 <p><object width="400" height="250"><param name="movie"
-value="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.youtube.com<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">v<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">g3lIPlegDJk?fs=1&amp;hl=en_US&amp;rel=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">param><param
-name="allowFullScreen" value="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">param><param name="allowscriptaccess"
-value="always">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">param><embed
-src="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.youtube.com<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">v<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">g3lIPlegDJk?fs=1&amp;hl=en_US&amp;rel=0"
-type="application<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/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">-shockwave-flash" allowscriptaccess="always"
-allowfullscreen="true" width="400" height="250">&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">embed>&lt;<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">object></p>
+value="http://www.youtube.com/v/g3lIPlegDJk?fs=1&amp;hl=en_US&amp;rel=0"></param><param
+name="allowFullScreen" value="true"></param><param name="allowscriptaccess"
+value="always"></param><embed
+src="http://www.youtube.com/v/g3lIPlegDJk?fs=1&amp;hl=en_US&amp;rel=0"
+type="application/x-shockwave-flash" allowscriptaccess="always"
+allowfullscreen="true" width="400" height="250"></embed></object></p>
 
 <p>{html}
 {span}
 {div}
-In this e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample we use the <em>@Resource</em> annotation to inject a
-<em>java<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">.sql.DataSource</em> into our bean.  The trickiest thing about injecting
+In this example we use the <em>@Resource</em> annotation to inject a
+<em>javax.sql.DataSource</em> into our bean.  The trickiest thing about injecting
 a DataSource is not declaring the annotation, but actually configuring the
 data source.</p>
 
@@ -181,71 +181,71 @@ in code:</p>
 <pre><code>@Resource DataSource customerDataSource;
 </code></pre>
 
-<p>Matches a data source declared as follows in the openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml file:</p>
+<p>Matches a data source declared as follows in the openejb.xml file:</p>
 
 <pre><code>&lt;Resource type="DataSource" id="customerDataSource"&gt;
  ....
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Resource&gt;
+&lt;/Resource&gt;
 </code></pre>
 
-<p>As seen in this e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample, the data source can also be declared via
+<p>As seen in this example, the data source can also be declared via
 properties as follows:</p>
 
-<pre><code>customerDataSource = new:&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Resource?type=DataSource
+<pre><code>customerDataSource = new://Resource?type=DataSource
 </code></pre>
 
-<p>This style of properties creation can be used in the InitialConte<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">t
+<p>This style of properties creation can be used in the InitialContext
 properties, set into the System properties, or passed in on the command
 line as vm properties.</p>
 
-<p><em>The source for this e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample is in the "injection-of-datasource" directory
-located in the <a href="openejb:download.html">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</a>
+<p><em>The source for this example is in the "injection-of-datasource" directory
+located in the <a href="openejb:download.html">openejb-examples.zip</a>
  available on the download page.</em>
 {div}
 {div:style=clear:both;}{div}</p>
 
-<p><a name="InjectionofDataSourceE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample-TheCode">&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="InjectionofDataSourceExample-TheCode"></a></p>
 
 <h1>The Code</h1>
 
-<p>{snippet:id=code|url=openejb3<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="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">amples<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">injection-of-datasource<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">main<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" al
 t="" border="0">java<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">superbiz<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">injection<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">MoviesImpl.java|lang=java}</p>
+<p>{snippet:id=code|url=openejb3/examples/injection-of-datasource/src/main/java/org/superbiz/injection/MoviesImpl.java|lang=java}</p>
 
-<p><a name="InjectionofDataSourceE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample-Writingaunittestforthee<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample">&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="InjectionofDataSourceExample-Writingaunittestfortheexample"></a></p>
 
-<h1>Writing a unit test for the e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample</h1>
+<h1>Writing a unit test for the example</h1>
 
-<p>{snippet:id=code|url=openejb3<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="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">amples<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">injection-of-datasource<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">src<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">test<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" al
 t="" border="0">java<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">superbiz<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">injection<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">MoviesTest.java|lang=java}</p>
+<p>{snippet:id=code|url=openejb3/examples/injection-of-datasource/src/test/java/org/superbiz/injection/MoviesTest.java|lang=java}</p>
 
 <p>Note in the above test code the following lines:</p>
 
-<pre><code>p.put("movieDatabase", "new:&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Resource?type=DataSource");
+<pre><code>p.put("movieDatabase", "new://Resource?type=DataSource");
 p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
 p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
 </code></pre>
 
 <p>As mentioned these actually create and configure the data source.  When
-OpenEJB boots up, these properties will get read 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">ecuted allowing you
+OpenEJB boots up, these properties will get read and executed allowing you
 to keep all the configuration required to run your tests right in the test
-case itself.  No need to keep dozens of openejb.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ml config files in your
+case itself.  No need to keep dozens of openejb.xml config files in your
 projects or try and create one big configuration that might end up loading
 a lot of unneeded containers and resources.  </p>
 
 <p>In your production system you can place the properties into the
-OPENEJB_HOME<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">conf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">system.properties file or add them to your
-OPENEJB_HOME<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">conf<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb.<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 a declaration like so:</p>
+OPENEJB_HOME/conf/system.properties file or add them to your
+OPENEJB_HOME/conf/openejb.xml with a declaration like so:</p>
 
 <pre><code>&lt;Resource type="DataSource" id="movieDatabase"&gt;
  JdbcDriver = org.hsqldb.jdbcDriver
  JdbcUrl = jdbc:hsqldb:mem:moviedb
-&lt;&lt;IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"&gt;Resource&gt;
+&lt;/Resource&gt;
 </code></pre>
 
-<p><a name="InjectionofDataSourceE<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample-Running">&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="InjectionofDataSourceExample-Running"></a></p>
 
 <h1>Running</h1>
 
-<p>Running the e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">ample is fairly simple.  In the "injection-of-datasource"
-directory of the <a href="openejb:download.html">e<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">amples zip</a>
+<p>Running the example is fairly simple.  In the "injection-of-datasource"
+directory of the <a href="openejb:download.html">examples zip</a>
 , just run:</p>
 
 <blockquote>
@@ -259,41 +259,41 @@ directory of the <a href="openejb:downlo
 -------------------------------------------------------
 Running org.superbiz.injection.MoviesTest
 Apache OpenEJB 3.0    build: 20080408-04:13
-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;openejb.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;
+http://openejb.apache.org/
 INFO - openejb.home =
 </code></pre>
 
-<p><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Users<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dblevins<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">work<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">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<IMG class="emo
 ticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">injection-of-datasource
+<p>/Users/dblevins/work/openejb-3.0/examples/injection-of-datasource
     INFO - openejb.base =
-<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Users<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dblevins<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">work<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">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<IMG class="emotic
 on" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">injection-of-datasource
+/Users/dblevins/work/openejb-3.0/examples/injection-of-datasource
     INFO - Configuring Service(id=Default Security Service,
 type=SecurityService, provider-id=Default Security Service)
     INFO - Configuring Service(id=Default Transaction Manager,
 type=TransactionManager, provider-id=Default Transaction Manager)
     INFO - Configuring Service(id=movieDatabase, type=Resource,
 provider-id=Default JDBC Database)
-    INFO - Configuring Service(id=Default JDK 1.3 Pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yFactory,
-type=Pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yFactory, provider-id=Default JDK 1.3 Pro<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" align="absmiddle" alt="" border="0">yFactory)
+    INFO - Configuring Service(id=Default JDK 1.3 ProxyFactory,
+type=ProxyFactory, provider-id=Default JDK 1.3 ProxyFactory)
     INFO - Found EjbModule in classpath:
-<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Users<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dblevins<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">work<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">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<IMG class="emotic
 on" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">injection-of-datasource<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">target<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">classes
+/Users/dblevins/work/openejb-3.0/examples/injection-of-datasource/target/classes
     INFO - Configuring app:
-<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Users<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dblevins<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">work<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">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<IMG class="emotic
 on" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">injection-of-datasource<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">target<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">classes
+/Users/dblevins/work/openejb-3.0/examples/injection-of-datasource/target/classes
     INFO - Configuring Service(id=Default Stateful Container, type=Container,
 provider-id=Default Stateful Container)
     INFO - Auto-creating a container for bean Movies: Container(type=STATEFUL,
 id=Default Stateful Container)
     INFO - Auto-linking resource-ref
-'org.superbiz.injection.MoviesImpl<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">movieDatabase' in bean Movies to
+'org.superbiz.injection.MoviesImpl/movieDatabase' in bean Movies to
 Resource(id=movieDatabase)
     INFO - Loaded Module:
-<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Users<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dblevins<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">work<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">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<IMG class="emotic
 on" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">injection-of-datasource<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">target<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">classes
+/Users/dblevins/work/openejb-3.0/examples/injection-of-datasource/target/classes
     INFO - Assembling app:
-<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Users<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dblevins<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">work<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">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<IMG class="emotic
 on" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">injection-of-datasource<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">target<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">classes
+/Users/dblevins/work/openejb-3.0/examples/injection-of-datasource/target/classes
     INFO - Jndi(name=MoviesLocal) --> Ejb(deployment-id=Movies)
     INFO - Created Ejb(deployment-id=Movies, ejb-name=Movies, container=Default
 Stateful Container)
     INFO - Deployed
-Application(path=<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">Users<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">dblevins<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">work<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">openejb-3.0<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">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<
 IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">injection-of-datasource<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">target<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">classes)
+Application(path=/Users/dblevins/work/openejb-3.0/examples/injection-of-datasource/target/classes)
     Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.911 sec</p>
 
 <pre><code>Results :